gcc -Wall lint.

	* alpha-tdep.c (alpha_in_lenient_prologue): Comment out.
	(after_prologue): Remove unused local b.
	* procfs.c (thread.h): Include.
	(pr_flag_table, pr_why_table, faults_table, siginfo_table): Use
	nested braces in initializer.
	* top.c (initialize_targets, initialize_utils): Declare.
	(locate_arg, insert_args): Add parens around tested assignments.
	* remote-utils.c (sr_scan_args): Remove decl of strtol.
	* remote.c (thread.h): Include.
	(remote_wait): Remove unused local p2.
	* sparc-tdep.c (fill_gregset, fill_fpregset): Remove decls of
	registers array.

	defs.h (stdlib.h): Include.
	(exit, perror, atoi, qsort, memcpy, memcmp): Don't declare.
	(fclose, atof, malloc, realloc, free, strchr, strrchr, strstr,
	strtok,	strerror): Don't specify parameter types in declaration.

6 files changed, 155 insertions, 185 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 60c7bac..44a8e14 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,24 @@
+Wed Feb  1 13:27:33 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	gcc -Wall lint.
+	* alpha-tdep.c (alpha_in_lenient_prologue): Comment out.
+	(after_prologue): Remove unused local b.
+	* procfs.c (thread.h): Include.
+	(pr_flag_table, pr_why_table, faults_table, siginfo_table): Use
+	nested braces in initializer.
+	* top.c (initialize_targets, initialize_utils): Declare.
+	(locate_arg, insert_args): Add parens around tested assignments.
+	* remote-utils.c (sr_scan_args): Remove decl of strtol.
+	* remote.c (thread.h): Include.
+	(remote_wait): Remove unused local p2.
+	* sparc-tdep.c (fill_gregset, fill_fpregset): Remove decls of
+	registers array.
+
+	defs.h (stdlib.h): Include.
+	(exit, perror, atoi, qsort, memcpy, memcmp): Don't declare.
+	(fclose, atof, malloc, realloc, free, strchr, strrchr, strstr,
+	strtok,	strerror): Don't specify parameter types in declaration.
+
 Wed Feb  1 12:23:57 1995  Per Bothner  <bothner@kalessin.cygnus.com>
 
 	* ch-exp.y (value_string_element, string_primitive_value,
@@ -57,10 +78,10 @@ Tue Jan 31 09:40:11 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
 	actually present.
 
 Mon Jan 30 17:34:24 1995  Stu Grossman  (grossman@cygnus.com)
-
+start-sanitize-gdbtk
 	* gdbtk.tcl (create_file_win):  Disable old popup menu for source
 	window.
-
+end-sanitize-gdbtk
 	* sparcl-tdep.c:  Add `sparclite' target for doing serial and udp
 	downloads to SPARClite demo boards.
 
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index 08a296a..7dedb78 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -44,11 +44,15 @@ static alpha_extra_func_info_t heuristic_proc_desc PARAMS ((CORE_ADDR,
 							    CORE_ADDR,
 							    struct frame_info *));
 
-static alpha_extra_func_info_t find_proc_desc PARAMS ((CORE_ADDR, struct frame_info *));
+static alpha_extra_func_info_t find_proc_desc PARAMS ((CORE_ADDR,
+						       struct frame_info *));
 
+#if 0
 static int alpha_in_lenient_prologue PARAMS ((CORE_ADDR, CORE_ADDR));
+#endif
 
-static void reinit_frame_cache_sfunc PARAMS ((char *, int, struct cmd_list_element *));
+static void reinit_frame_cache_sfunc PARAMS ((char *, int,
+					      struct cmd_list_element *));
 
 static CORE_ADDR after_prologue PARAMS ((CORE_ADDR pc,
 					 alpha_extra_func_info_t proc_desc));
@@ -382,7 +386,6 @@ after_prologue (pc, proc_desc)
      CORE_ADDR pc;
      alpha_extra_func_info_t proc_desc;
 {
-  struct block *b;
   struct symtab_and_line sal;
   CORE_ADDR func_addr, func_end;
 
@@ -971,6 +974,7 @@ alpha_skip_prologue (pc, lenient)
     return pc + offset;
 }
 
+#if 0
 /* Is address PC in the prologue (loosely defined) for function at
    STARTADDR?  */
 
@@ -982,6 +986,7 @@ alpha_in_lenient_prologue (startaddr, pc)
   CORE_ADDR end_prologue = alpha_skip_prologue (startaddr, 1);
   return pc >= startaddr && pc < end_prologue;
 }
+#endif
 
 /* The alpha needs a conversion between register and memory format if
    the register is a floating point register and
diff --git a/gdb/defs.h b/gdb/defs.h
index 6f6e267..41eac44 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -553,8 +553,6 @@ extern void error_begin PARAMS ((void));
 
 extern NORETURN void fatal () ATTR_NORETURN;
 
-extern NORETURN void exit PARAMS ((int)) ATTR_NORETURN;	/* 4.10.4.3 */
-
 extern NORETURN void nomem PARAMS ((long)) ATTR_NORETURN;
 
 /* Reasons for calling return_to_top_level.  */
@@ -593,62 +591,34 @@ extern char *getenv PARAMS ((const char *));
 extern void psignal PARAMS ((unsigned, const char *));
 #endif
 
-/* For now, we can't include <stdlib.h> because it conflicts with
-   "../include/getopt.h".  (FIXME)
-
-   However, if a function is defined in the ANSI C standard and a prototype
-   for that function is defined and visible in any header file in an ANSI
-   conforming environment, then that prototype must match the definition in
-   the ANSI standard.  So we can just duplicate them here without conflict,
-   since they must be the same in all conforming ANSI environments.  If
-   these cause problems, then the environment is not ANSI conformant. */
-   
 #ifdef __STDC__
 #include <stddef.h>
+#include <stdlib.h>
 #endif
 
-extern int fclose PARAMS ((GDB_FILE *stream));		/* 4.9.5.1 */
-
-extern void perror PARAMS ((const char *));		/* 4.9.10.4 */
+extern int fclose ();
 
-extern double atof PARAMS ((const char *nptr));		/* 4.10.1.1 */
-
-extern int atoi PARAMS ((const char *));		/* 4.10.1.2 */
+extern double atof ();
 
 #ifndef MALLOC_INCOMPATIBLE
 
-extern PTR malloc PARAMS ((size_t size));		/* 4.10.3.3 */
-
-extern PTR realloc PARAMS ((void *ptr, size_t size));	/* 4.10.3.4 */
+extern PTR malloc ();
 
-extern void free PARAMS ((void *));			/* 4.10.3.2 */
+extern PTR realloc ();
 
-#endif	/* MALLOC_INCOMPATIBLE */
+extern void free ();
 
-extern void
-qsort PARAMS ((void *base, size_t nmemb,		/* 4.10.5.2 */
-	       size_t size,
-	       int (*compar)(const void *, const void *)));
+#endif /* MALLOC_INCOMPATIBLE */
 
-#ifndef	MEM_FNS_DECLARED	/* Some non-ANSI use void *, not char *.  */
-extern PTR memcpy PARAMS ((void *, const void *, size_t));  /* 4.11.2.1 */
+extern char *strchr ();
 
-extern int memcmp PARAMS ((const void *, const void *, size_t)); /* 4.11.4.1 */
-#endif
-
-extern char *strchr PARAMS ((const char *, int));	/* 4.11.5.2 */
-
-extern char *strrchr PARAMS ((const char *, int));	/* 4.11.5.5 */
+extern char *strrchr ();
 
-extern char *strstr PARAMS ((const char *, const char *)); /* 4.11.5.7 */
+extern char *strstr ();
 
-extern char *strtok PARAMS ((char *, const char *));	/* 4.11.5.8 */
-
-#ifndef	MEM_FNS_DECLARED	/* Some non-ANSI use void *, not char *.  */
-extern PTR memset PARAMS ((void *, int, size_t));	/* 4.11.6.1 */
-#endif
+extern char *strtok ();
 
-extern char *strerror PARAMS ((int));			/* 4.11.6.2 */
+extern char *strerror ();
 
 /* Various possibilities for alloca.  */
 #ifndef alloca
@@ -861,7 +831,7 @@ extern void (*fputs_unfiltered_hook) PARAMS ((const char *linebuffer,
 extern void (*print_frame_info_listing_hook) PARAMS ((struct symtab *s,
 						      int line, int stopline,
 						      int noerror));
-extern int (*query_hook) PARAMS ((void));
+extern int (*query_hook) PARAMS (());
 extern void (*flush_hook) PARAMS ((FILE *stream));
 extern void (*create_breakpoint_hook) PARAMS ((struct breakpoint *b));
 extern void (*delete_breakpoint_hook) PARAMS ((struct breakpoint *bpt));
@@ -879,7 +849,7 @@ extern int (*target_wait_hook) PARAMS ((int pid,
 extern void (*call_command_hook) PARAMS ((struct cmd_list_element *c,
 					  char *cmd, int from_tty));
 
-extern NORETURN void (*error_hook) PARAMS ((void));
+extern NORETURN void (*error_hook) PARAMS (());
 
 /* Inhibit window interface if non-zero. */
 
diff --git a/gdb/procfs.c b/gdb/procfs.c
index bcae876..1897bf4 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -51,6 +51,7 @@ regardless of whether or not the actual target has floating point hardware.
 #include "target.h"
 #include "command.h"
 #include "gdbcore.h"
+#include "thread.h"
 
 #define MAX_SYSCALLS	256	/* Maximum number of syscalls for table */
 
@@ -129,45 +130,45 @@ struct trans {
 static struct trans pr_flag_table[] =
 {
 #if defined (PR_STOPPED)
-  PR_STOPPED, "PR_STOPPED", "Process is stopped",
+  { PR_STOPPED, "PR_STOPPED", "Process is stopped" },
 #endif
 #if defined (PR_ISTOP)
-  PR_ISTOP, "PR_ISTOP", "Stopped on an event of interest",
+  { PR_ISTOP, "PR_ISTOP", "Stopped on an event of interest" },
 #endif
 #if defined (PR_DSTOP)
-  PR_DSTOP, "PR_DSTOP", "A stop directive is in effect",
+  { PR_DSTOP, "PR_DSTOP", "A stop directive is in effect" },
 #endif
 #if defined (PR_ASLEEP)
-  PR_ASLEEP, "PR_ASLEEP", "Sleeping in an interruptible system call",
+  { PR_ASLEEP, "PR_ASLEEP", "Sleeping in an interruptible system call" },
 #endif
 #if defined (PR_FORK)
-  PR_FORK, "PR_FORK", "Inherit-on-fork is in effect",
+  { PR_FORK, "PR_FORK", "Inherit-on-fork is in effect" },
 #endif
 #if defined (PR_RLC)
-  PR_RLC, "PR_RLC", "Run-on-last-close is in effect",
+  { PR_RLC, "PR_RLC", "Run-on-last-close is in effect" },
 #endif
 #if defined (PR_PTRACE)
-  PR_PTRACE, "PR_PTRACE", "Process is being controlled by ptrace",
+  { PR_PTRACE, "PR_PTRACE", "Process is being controlled by ptrace" },
 #endif
 #if defined (PR_PCINVAL)
-  PR_PCINVAL, "PR_PCINVAL", "PC refers to an invalid virtual address",
+  { PR_PCINVAL, "PR_PCINVAL", "PC refers to an invalid virtual address" },
 #endif
 #if defined (PR_ISSYS)
-  PR_ISSYS, "PR_ISSYS", "Is a system process",
+  { PR_ISSYS, "PR_ISSYS", "Is a system process" },
 #endif
 #if defined (PR_STEP)
-  PR_STEP, "PR_STEP", "Process has single step pending",
+  { PR_STEP, "PR_STEP", "Process has single step pending" },
 #endif
 #if defined (PR_KLC)
-  PR_KLC, "PR_KLC", "Kill-on-last-close is in effect",
+  { PR_KLC, "PR_KLC", "Kill-on-last-close is in effect" },
 #endif
 #if defined (PR_ASYNC)
-  PR_ASYNC, "PR_ASYNC", "Asynchronous stop is in effect",
+  { PR_ASYNC, "PR_ASYNC", "Asynchronous stop is in effect" },
 #endif
 #if defined (PR_PCOMPAT)
-  PR_PCOMPAT, "PR_PCOMPAT", "Ptrace compatibility mode in effect",
+  { PR_PCOMPAT, "PR_PCOMPAT", "Ptrace compatibility mode in effect" },
 #endif
- 0, NULL, NULL
+  { 0, NULL, NULL }
 };
 
 /*  Translate values in the pr_why field of the prstatus struct. */
@@ -175,27 +176,27 @@ static struct trans pr_flag_table[] =
 static struct trans pr_why_table[] =
 {
 #if defined (PR_REQUESTED)
- PR_REQUESTED, "PR_REQUESTED", "Directed to stop via PIOCSTOP/PIOCWSTOP",
+  { PR_REQUESTED, "PR_REQUESTED", "Directed to stop via PIOCSTOP/PIOCWSTOP" },
 #endif
 #if defined (PR_SIGNALLED)
- PR_SIGNALLED, "PR_SIGNALLED", "Receipt of a traced signal",
+  { PR_SIGNALLED, "PR_SIGNALLED", "Receipt of a traced signal" },
 #endif
 #if defined (PR_FAULTED)
- PR_FAULTED, "PR_FAULTED", "Incurred a traced hardware fault",
+  { PR_FAULTED, "PR_FAULTED", "Incurred a traced hardware fault" },
 #endif
 #if defined (PR_SYSENTRY)
- PR_SYSENTRY, "PR_SYSENTRY", "Entry to a traced system call",
+  { PR_SYSENTRY, "PR_SYSENTRY", "Entry to a traced system call" },
 #endif
 #if defined (PR_SYSEXIT)
- PR_SYSEXIT, "PR_SYSEXIT", "Exit from a traced system call",
+  { PR_SYSEXIT, "PR_SYSEXIT", "Exit from a traced system call" },
 #endif
 #if defined (PR_JOBCONTROL)
- PR_JOBCONTROL, "PR_JOBCONTROL", "Default job control stop signal action",
+  { PR_JOBCONTROL, "PR_JOBCONTROL", "Default job control stop signal action" },
 #endif
 #if defined (PR_SUSPENDED)
- PR_SUSPENDED, "PR_SUSPENDED", "Process suspended",
+  { PR_SUSPENDED, "PR_SUSPENDED", "Process suspended" },
 #endif
- 0, NULL, NULL
+  { 0, NULL, NULL }
 };
 
 /*  Hardware fault translation table. */
@@ -203,39 +204,39 @@ static struct trans pr_why_table[] =
 static struct trans faults_table[] =
 {
 #if defined (FLTILL)
- FLTILL, "FLTILL", "Illegal instruction",
+  { FLTILL, "FLTILL", "Illegal instruction" },
 #endif
 #if defined (FLTPRIV)
- FLTPRIV, "FLTPRIV", "Privileged instruction",
+  { FLTPRIV, "FLTPRIV", "Privileged instruction" },
 #endif
 #if defined (FLTBPT)
- FLTBPT, "FLTBPT", "Breakpoint trap",
+  { FLTBPT, "FLTBPT", "Breakpoint trap" },
 #endif
 #if defined (FLTTRACE)
- FLTTRACE, "FLTTRACE", "Trace trap",
+  { FLTTRACE, "FLTTRACE", "Trace trap" },
 #endif
 #if defined (FLTACCESS)
- FLTACCESS, "FLTACCESS", "Memory access fault",
+  { FLTACCESS, "FLTACCESS", "Memory access fault" },
 #endif
 #if defined (FLTBOUNDS)
- FLTBOUNDS, "FLTBOUNDS", "Memory bounds violation",
+  { FLTBOUNDS, "FLTBOUNDS", "Memory bounds violation" },
 #endif
 #if defined (FLTIOVF)
- FLTIOVF, "FLTIOVF", "Integer overflow",
+  { FLTIOVF, "FLTIOVF", "Integer overflow" },
 #endif
 #if defined (FLTIZDIV)
- FLTIZDIV, "FLTIZDIV", "Integer zero divide",
+  { FLTIZDIV, "FLTIZDIV", "Integer zero divide" },
 #endif
 #if defined (FLTFPE)
- FLTFPE, "FLTFPE", "Floating-point exception",
+  { FLTFPE, "FLTFPE", "Floating-point exception" },
 #endif
 #if defined (FLTSTACK)
- FLTSTACK, "FLTSTACK", "Unrecoverable stack fault",
+  { FLTSTACK, "FLTSTACK", "Unrecoverable stack fault" },
 #endif
 #if defined (FLTPAGE)
- FLTPAGE, "FLTPAGE", "Recoverable page fault",
+  { FLTPAGE, "FLTPAGE", "Recoverable page fault" },
 #endif
- 0, NULL, NULL
+  { 0, NULL, NULL }
 };
 
 /* Translation table for signal generation information.  See UNIX System
@@ -248,209 +249,179 @@ static struct sigcode {
   char *desc;
 } siginfo_table[] = {
 #if defined (SIGILL) && defined (ILL_ILLOPC)
-  SIGILL, ILL_ILLOPC, "ILL_ILLOPC", "Illegal opcode",
+  { SIGILL, ILL_ILLOPC, "ILL_ILLOPC", "Illegal opcode" },
 #endif
 #if defined (SIGILL) && defined (ILL_ILLOPN)
-  SIGILL, ILL_ILLOPN, "ILL_ILLOPN", "Illegal operand",
+  { SIGILL, ILL_ILLOPN, "ILL_ILLOPN", "Illegal operand", },
 #endif
 #if defined (SIGILL) && defined (ILL_ILLADR)
-  SIGILL, ILL_ILLADR, "ILL_ILLADR", "Illegal addressing mode",
+  { SIGILL, ILL_ILLADR, "ILL_ILLADR", "Illegal addressing mode" },
 #endif
 #if defined (SIGILL) && defined (ILL_ILLTRP)
-  SIGILL, ILL_ILLTRP, "ILL_ILLTRP", "Illegal trap",
+  { SIGILL, ILL_ILLTRP, "ILL_ILLTRP", "Illegal trap" },
 #endif
 #if defined (SIGILL) && defined (ILL_PRVOPC)
-  SIGILL, ILL_PRVOPC, "ILL_PRVOPC", "Privileged opcode",
+  { SIGILL, ILL_PRVOPC, "ILL_PRVOPC", "Privileged opcode" },
 #endif
 #if defined (SIGILL) && defined (ILL_PRVREG)
-  SIGILL, ILL_PRVREG, "ILL_PRVREG", "Privileged register",
+  { SIGILL, ILL_PRVREG, "ILL_PRVREG", "Privileged register" },
 #endif
 #if defined (SIGILL) && defined (ILL_COPROC)
-  SIGILL, ILL_COPROC, "ILL_COPROC", "Coprocessor error",
+  { SIGILL, ILL_COPROC, "ILL_COPROC", "Coprocessor error" },
 #endif
 #if defined (SIGILL) && defined (ILL_BADSTK)
-  SIGILL, ILL_BADSTK, "ILL_BADSTK", "Internal stack error",
+  { SIGILL, ILL_BADSTK, "ILL_BADSTK", "Internal stack error" },
 #endif
 #if defined (SIGFPE) && defined (FPE_INTDIV)
-  SIGFPE, FPE_INTDIV, "FPE_INTDIV", "Integer divide by zero",
+  { SIGFPE, FPE_INTDIV, "FPE_INTDIV", "Integer divide by zero" },
 #endif
 #if defined (SIGFPE) && defined (FPE_INTOVF)
-  SIGFPE, FPE_INTOVF, "FPE_INTOVF", "Integer overflow",
+  { SIGFPE, FPE_INTOVF, "FPE_INTOVF", "Integer overflow" },
 #endif
 #if defined (SIGFPE) && defined (FPE_FLTDIV)
-  SIGFPE, FPE_FLTDIV, "FPE_FLTDIV", "Floating point divide by zero",
+  { SIGFPE, FPE_FLTDIV, "FPE_FLTDIV", "Floating point divide by zero" },
 #endif
 #if defined (SIGFPE) && defined (FPE_FLTOVF)
-  SIGFPE, FPE_FLTOVF, "FPE_FLTOVF", "Floating point overflow",
+  { SIGFPE, FPE_FLTOVF, "FPE_FLTOVF", "Floating point overflow" },
 #endif
 #if defined (SIGFPE) && defined (FPE_FLTUND)
-  SIGFPE, FPE_FLTUND, "FPE_FLTUND", "Floating point underflow",
+  { SIGFPE, FPE_FLTUND, "FPE_FLTUND", "Floating point underflow" },
 #endif
 #if defined (SIGFPE) && defined (FPE_FLTRES)
-  SIGFPE, FPE_FLTRES, "FPE_FLTRES", "Floating point inexact result",
+  { SIGFPE, FPE_FLTRES, "FPE_FLTRES", "Floating point inexact result" },
 #endif
 #if defined (SIGFPE) && defined (FPE_FLTINV)
-  SIGFPE, FPE_FLTINV, "FPE_FLTINV", "Invalid floating point operation",
+  { SIGFPE, FPE_FLTINV, "FPE_FLTINV", "Invalid floating point operation" },
 #endif
 #if defined (SIGFPE) && defined (FPE_FLTSUB)
-  SIGFPE, FPE_FLTSUB, "FPE_FLTSUB", "Subscript out of range",
+  { SIGFPE, FPE_FLTSUB, "FPE_FLTSUB", "Subscript out of range" },
 #endif
 #if defined (SIGSEGV) && defined (SEGV_MAPERR)
-  SIGSEGV, SEGV_MAPERR, "SEGV_MAPERR", "Address not mapped to object",
+  { SIGSEGV, SEGV_MAPERR, "SEGV_MAPERR", "Address not mapped to object" },
 #endif
 #if defined (SIGSEGV) && defined (SEGV_ACCERR)
-  SIGSEGV, SEGV_ACCERR, "SEGV_ACCERR", "Invalid permissions for object",
+  { SIGSEGV, SEGV_ACCERR, "SEGV_ACCERR", "Invalid permissions for object" },
 #endif
 #if defined (SIGBUS) && defined (BUS_ADRALN)
-  SIGBUS, BUS_ADRALN, "BUS_ADRALN", "Invalid address alignment",
+  { SIGBUS, BUS_ADRALN, "BUS_ADRALN", "Invalid address alignment" },
 #endif
 #if defined (SIGBUS) && defined (BUS_ADRERR)
-  SIGBUS, BUS_ADRERR, "BUS_ADRERR", "Non-existent physical address",
+  { SIGBUS, BUS_ADRERR, "BUS_ADRERR", "Non-existent physical address" },
 #endif
 #if defined (SIGBUS) && defined (BUS_OBJERR)
-  SIGBUS, BUS_OBJERR, "BUS_OBJERR", "Object specific hardware error",
+  { SIGBUS, BUS_OBJERR, "BUS_OBJERR", "Object specific hardware error" },
 #endif
 #if defined (SIGTRAP) && defined (TRAP_BRKPT)
-  SIGTRAP, TRAP_BRKPT, "TRAP_BRKPT", "Process breakpoint",
+  { SIGTRAP, TRAP_BRKPT, "TRAP_BRKPT", "Process breakpoint" },
 #endif
 #if defined (SIGTRAP) && defined (TRAP_TRACE)
-  SIGTRAP, TRAP_TRACE, "TRAP_TRACE", "Process trace trap",
+  { SIGTRAP, TRAP_TRACE, "TRAP_TRACE", "Process trace trap" },
 #endif
 #if defined (SIGCLD) && defined (CLD_EXITED)
-  SIGCLD, CLD_EXITED, "CLD_EXITED", "Child has exited",
+  { SIGCLD, CLD_EXITED, "CLD_EXITED", "Child has exited" },
 #endif
 #if defined (SIGCLD) && defined (CLD_KILLED)
-  SIGCLD, CLD_KILLED, "CLD_KILLED", "Child was killed",
+  { SIGCLD, CLD_KILLED, "CLD_KILLED", "Child was killed" },
 #endif
 #if defined (SIGCLD) && defined (CLD_DUMPED)
-  SIGCLD, CLD_DUMPED, "CLD_DUMPED", "Child has terminated abnormally",
+  { SIGCLD, CLD_DUMPED, "CLD_DUMPED", "Child has terminated abnormally" },
 #endif
 #if defined (SIGCLD) && defined (CLD_TRAPPED)
-  SIGCLD, CLD_TRAPPED, "CLD_TRAPPED", "Traced child has trapped",
+  { SIGCLD, CLD_TRAPPED, "CLD_TRAPPED", "Traced child has trapped" },
 #endif
 #if defined (SIGCLD) && defined (CLD_STOPPED)
-  SIGCLD, CLD_STOPPED, "CLD_STOPPED", "Child has stopped",
+  { SIGCLD, CLD_STOPPED, "CLD_STOPPED", "Child has stopped" },
 #endif
 #if defined (SIGCLD) && defined (CLD_CONTINUED)
-  SIGCLD, CLD_CONTINUED, "CLD_CONTINUED", "Stopped child had continued",
+  { SIGCLD, CLD_CONTINUED, "CLD_CONTINUED", "Stopped child had continued" },
 #endif
 #if defined (SIGPOLL) && defined (POLL_IN)
-  SIGPOLL, POLL_IN, "POLL_IN", "Input input available",
+  { SIGPOLL, POLL_IN, "POLL_IN", "Input input available" },
 #endif
 #if defined (SIGPOLL) && defined (POLL_OUT)
-  SIGPOLL, POLL_OUT, "POLL_OUT", "Output buffers available",
+  { SIGPOLL, POLL_OUT, "POLL_OUT", "Output buffers available" },
 #endif
 #if defined (SIGPOLL) && defined (POLL_MSG)
-  SIGPOLL, POLL_MSG, "POLL_MSG", "Input message available",
+  { SIGPOLL, POLL_MSG, "POLL_MSG", "Input message available" },
 #endif
 #if defined (SIGPOLL) && defined (POLL_ERR)
-  SIGPOLL, POLL_ERR, "POLL_ERR", "I/O error",
+  { SIGPOLL, POLL_ERR, "POLL_ERR", "I/O error" },
 #endif
 #if defined (SIGPOLL) && defined (POLL_PRI)
-  SIGPOLL, POLL_PRI, "POLL_PRI", "High priority input available",
+  { SIGPOLL, POLL_PRI, "POLL_PRI", "High priority input available" },
 #endif
 #if defined (SIGPOLL) && defined (POLL_HUP)
-  SIGPOLL, POLL_HUP, "POLL_HUP", "Device disconnected",
+  { SIGPOLL, POLL_HUP, "POLL_HUP", "Device disconnected" },
 #endif
-  0, 0, NULL, NULL
+  { 0, 0, NULL, NULL }
 };
 
 static char *syscall_table[MAX_SYSCALLS];
 
 /* Prototypes for local functions */
 
-static void
-set_proc_siginfo PARAMS ((struct procinfo *, int));
+static void set_proc_siginfo PARAMS ((struct procinfo *, int));
 
-static void
-init_syscall_table PARAMS ((void));
+static void init_syscall_table PARAMS ((void));
 
-static char *
-syscallname PARAMS ((int));
+static char *syscallname PARAMS ((int));
 
-static char *
-signalname PARAMS ((int));
+static char *signalname PARAMS ((int));
 
-static char *
-errnoname PARAMS ((int));
+static char *errnoname PARAMS ((int));
 
-static int
-proc_address_to_fd PARAMS ((struct procinfo *, CORE_ADDR, int));
+static int proc_address_to_fd PARAMS ((struct procinfo *, CORE_ADDR, int));
 
-static int
-open_proc_file PARAMS ((int, struct procinfo *, int));
+static int open_proc_file PARAMS ((int, struct procinfo *, int));
 
-static void
-close_proc_file PARAMS ((struct procinfo *));
+static void close_proc_file PARAMS ((struct procinfo *));
 
-static void
-unconditionally_kill_inferior PARAMS ((struct procinfo *));
+static void unconditionally_kill_inferior PARAMS ((struct procinfo *));
 
-static NORETURN void
-proc_init_failed PARAMS ((struct procinfo *, char *)) ATTR_NORETURN;
+static NORETURN void proc_init_failed PARAMS ((struct procinfo *, char *)) ATTR_NORETURN;
 
-static void
-info_proc PARAMS ((char *, int));
+static void info_proc PARAMS ((char *, int));
 
-static void
-info_proc_flags PARAMS ((struct procinfo *, int));
+static void info_proc_flags PARAMS ((struct procinfo *, int));
 
-static void
-info_proc_stop PARAMS ((struct procinfo *, int));
+static void info_proc_stop PARAMS ((struct procinfo *, int));
 
-static void
-info_proc_siginfo PARAMS ((struct procinfo *, int));
+static void info_proc_siginfo PARAMS ((struct procinfo *, int));
 
-static void
-info_proc_syscalls PARAMS ((struct procinfo *, int));
+static void info_proc_syscalls PARAMS ((struct procinfo *, int));
 
-static void
-info_proc_mappings PARAMS ((struct procinfo *, int));
+static void info_proc_mappings PARAMS ((struct procinfo *, int));
 
-static void
-info_proc_signals PARAMS ((struct procinfo *, int));
+static void info_proc_signals PARAMS ((struct procinfo *, int));
 
-static void
-info_proc_faults PARAMS ((struct procinfo *, int));
+static void info_proc_faults PARAMS ((struct procinfo *, int));
 
-static char *
-mappingflags PARAMS ((long));
+static char *mappingflags PARAMS ((long));
 
-static char *
-lookupname PARAMS ((struct trans *, unsigned int, char *));
+static char *lookupname PARAMS ((struct trans *, unsigned int, char *));
 
-static char *
-lookupdesc PARAMS ((struct trans *, unsigned int));
+static char *lookupdesc PARAMS ((struct trans *, unsigned int));
 
-static int
-do_attach PARAMS ((int pid));
+static int do_attach PARAMS ((int pid));
 
-static void
-do_detach PARAMS ((int siggnal));
+static void do_detach PARAMS ((int siggnal));
 
-static void
-procfs_create_inferior PARAMS ((char *, char *, char **));
+static void procfs_create_inferior PARAMS ((char *, char *, char **));
 
-static void
-procfs_notice_signals PARAMS ((int pid));
+static void procfs_notice_signals PARAMS ((int pid));
 
-static struct procinfo *
-find_procinfo PARAMS ((pid_t pid, int okfail));
+static struct procinfo *find_procinfo PARAMS ((pid_t pid, int okfail));
 
 /* External function prototypes that can't be easily included in any
    header file because the args are typedefs in system include files. */
 
-extern void
-supply_gregset PARAMS ((gregset_t *));
+extern void supply_gregset PARAMS ((gregset_t *));
 
-extern void
-fill_gregset PARAMS ((gregset_t *, int));
+extern void fill_gregset PARAMS ((gregset_t *, int));
 
-extern void
-supply_fpregset PARAMS ((fpregset_t *));
+extern void supply_fpregset PARAMS ((fpregset_t *));
 
-extern void
-fill_fpregset PARAMS ((fpregset_t *, int));
+extern void fill_fpregset PARAMS ((fpregset_t *, int));
 
 /*
 
diff --git a/gdb/remote-utils.c b/gdb/remote-utils.c
index b23aa70..ddd5239 100644
--- a/gdb/remote-utils.c
+++ b/gdb/remote-utils.c
@@ -102,8 +102,6 @@ sr_scan_args(proto, args)
   int n;
   char *p, *q;
 
-  extern int strtol();
-
   /* if no args, then nothing to do. */
   if (args == NULL || *args == '\0')
     return;
diff --git a/gdb/top.c b/gdb/top.c
index d89d2cf..f035ebe 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -56,6 +56,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/stat.h>
 #include <ctype.h>
 
+extern void initialize_targets PARAMS ((void));
+
+extern void initialize_utils PARAMS ((void));
+
 /* Prototypes for local functions */
 
 static char * line_completion_function PARAMS ((char *, int, char *, int));
@@ -1004,7 +1008,7 @@ static char *
 locate_arg (p)
      char *p;
 {
-  while (p = strchr (p, '$'))
+  while ((p = strchr (p, '$')))
     {
       if (strncmp (p, "$arg", 4) == 0 && isdigit (p[4]))
 	return p;
@@ -1026,7 +1030,7 @@ insert_args (line)
   /* First we need to know how much memory to allocate for the new line.  */
   save_line = line;
   len = 0;
-  while (p = locate_arg (line))
+  while ((p = locate_arg (line)))
     {
       len += p - line;
       i = p[4] - '0';
@@ -1054,7 +1058,7 @@ insert_args (line)
   /* Save pointer to beginning of new line.  */
   save_line = new_line;
 
-  while (p = locate_arg (line))
+  while ((p = locate_arg (line)))
     {
       int i, len;
 
@@ -1062,7 +1066,8 @@ insert_args (line)
       new_line += p - line;
       i = p[4] - '0';
 
-      if (len = user_args->a[i].len)
+      len = user_args->a[i].len;
+      if (len)
 	{
 	  memcpy (new_line, user_args->a[i].arg, len);
 	  new_line += len;