From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19051 invoked by alias); 7 Dec 2007 16:49:25 -0000 Received: (qmail 19024 invoked by uid 9514); 7 Dec 2007 16:49:24 -0000 Date: Fri, 07 Dec 2007 16:49:00 -0000 Message-ID: <20071207164924.19009.qmail@sourceware.org> From: pmuldoon@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Tweak Error values in common utilities. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 01f016ef60b42e011ffa962ef5524c687e0293ef X-Git-Newrev: f58119c5647ea4f0fde832a9bb080227926a52db Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2007-q4/txt/msg00545.txt.bz2 The branch, master has been updated via f58119c5647ea4f0fde832a9bb080227926a52db (commit) from 01f016ef60b42e011ffa962ef5524c687e0293ef (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit f58119c5647ea4f0fde832a9bb080227926a52db Author: Phil Muldoon Date: Fri Dec 7 16:49:17 2007 +0000 Tweak Error values in common utilities. 2007-12-07 Phil Muldoon * Util.java (getProcFromCoreFile): Tweak Error text. (getProcFromCoreExePair): Ditto. (getProcFromPid): Ditto. (getProcFromExeFile)L Ditto. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/util/ChangeLog | 5 +++++ frysk-core/frysk/util/Util.java | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/util/ChangeLog b/frysk-core/frysk/util/ChangeLog index c404a5b..fa30995 100644 --- a/frysk-core/frysk/util/ChangeLog +++ b/frysk-core/frysk/util/ChangeLog @@ -1,5 +1,10 @@ 2007-12-07 Phil Muldoon + * Util.java (getProcFromCoreFile): Tweak Error text. + (getProcFromCoreExePair): Ditto. + (getProcFromPid): Ditto. + (getProcFromExeFile)L Ditto. + * AuxvStringBuilder.java: New. 2007-12-04 Andrew Cagney diff --git a/frysk-core/frysk/util/Util.java b/frysk-core/frysk/util/Util.java index 828b859..59be104 100644 --- a/frysk-core/frysk/util/Util.java +++ b/frysk-core/frysk/util/Util.java @@ -1,6 +1,6 @@ // This file is part of the program FRYSK. // -// Copyright 2005, Red Hat Inc. +// Copyright 2005, 2007, Red Hat Inc. // // FRYSK is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by @@ -73,10 +73,10 @@ public class Util else { proc = null; - throw new RuntimeException("No proc in this corefile"); + throw new RuntimeException("Cannot find a process in this corefile."); } if (iterator.hasNext()) - throw new RuntimeException("Too many procs on this corefile"); + throw new RuntimeException("Too many processes in this corefile."); return proc; } @@ -93,10 +93,10 @@ public class Util else { proc = null; - throw new RuntimeException("No proc in this corefile"); + throw new RuntimeException("Cannot find a process in this corefile."); } if (iterator.hasNext()) - throw new RuntimeException("Too many procs on this corefile"); + throw new RuntimeException("Too many processes in this corefile."); return proc; } @@ -125,8 +125,8 @@ public class Util public void procNotFound (ProcId procId, Exception e) { - System.err.println("Couldn't find the process: " - + procId.toString()); + System.err.println("Could not find the process: " + + procId.intValue()); Manager.eventLoop.requestStop(); } } @@ -151,10 +151,10 @@ public class Util else { proc = null; - throw new RuntimeException("No proc in this exefile"); + throw new RuntimeException("Cannot find a process in this executable."); } if (iterator.hasNext()) - throw new RuntimeException("Too many procs in this exefile"); + throw new RuntimeException("Too many processes in this executable."); return proc; } hooks/post-receive -- frysk system monitor/debugger