summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--utils/ChangeLog6
-rw-r--r--utils/ps.c4
-rw-r--r--utils/rpctrace.c15
3 files changed, 18 insertions, 7 deletions
diff --git a/utils/ChangeLog b/utils/ChangeLog
index 4b02f072..deaaaefa 100644
--- a/utils/ChangeLog
+++ b/utils/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-15 Thomas Schwinge <tschwinge@gnu.org>
+
+ * ps.c (current_tty_name): Don't declare as static.
+ * rpctrace.c (print_contents): Don't use ?: as a lvalue.
+ (msgids_file_p): Don't declare as static.
+
2005-07-26 Alfred M. Szmidt <ams@gnu.org>
* rpctrace.c: Include <fnmatch.h>, <sys/stat.h>, and <dirent.h>.
diff --git a/utils/ps.c b/utils/ps.c
index 615852fd..6f209655 100644
--- a/utils/ps.c
+++ b/utils/ps.c
@@ -1,6 +1,6 @@
/* Show process information.
- Copyright (C) 1995,96,97,98,99,2002 Free Software Foundation, Inc.
+ Copyright (C) 1995,96,97,98,99,2002,2006 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.org>
@@ -249,7 +249,7 @@ main(int argc, char *argv[])
}
/* Returns the name of the current controlling terminal. */
- static const char *current_tty_name()
+ const char *current_tty_name()
{
error_t err;
struct ps_tty *tty;
diff --git a/utils/rpctrace.c b/utils/rpctrace.c
index 7646bb94..6d8beb78 100644
--- a/utils/rpctrace.c
+++ b/utils/rpctrace.c
@@ -1,6 +1,6 @@
/* Trace RPCs sent to selected ports
- Copyright (C) 1998,99,2001,02,03,05 Free Software Foundation, Inc.
+ Copyright (C) 1998,99,2001,02,03,05,2006 Free Software Foundation, Inc.
This file is part of the GNU Hurd.
@@ -616,11 +616,16 @@ print_contents (mach_msg_header_t *inp,
name = MACH_MSG_TYPE_MOVE_SEND;
}
- (type->msgt_longform ? lt->msgtl_name : type->msgt_name) = name;
+ if (type->msgt_longform)
+ lt->msgtl_name = name;
+ else
+ type->msgt_name = name;
}
else if (newtypes[0] != name)
- (type->msgt_longform ? lt->msgtl_name : type->msgt_name)
- = newtypes[0];
+ if (type->msgt_longform)
+ lt->msgtl_name = newtypes[0];
+ else
+ type->msgt_name = newtypes[0];
}
else
print_data (name, data, nelt, eltsize);
@@ -1083,7 +1088,7 @@ main (int argc, char **argv, char **envp)
struct dirent **eps;
int n;
- static int
+ int
msgids_file_p (const struct dirent *eps)
{
if (fnmatch ("*.msgids", eps->d_name, 0) != FNM_NOMATCH)