1 files changed, 56 insertions, 90 deletions

diff --git a/gdb/standalone.c b/gdb/standalone.c
index ebb14d98c16..1aa76d54f16 100644
--- a/gdb/standalone.c
+++ b/gdb/standalone.c
@@ -39,7 +39,7 @@
 
 /* Random system calls, mostly no-ops to prevent link problems  */
 
-ioctl (desc, code, arg)
+ioctl (int desc, int code, int arg)
 {
 }
 
@@ -47,27 +47,25 @@ int (*signal ()) ()
 {
 }
 
-kill ()
+kill (void)
 {
 }
 
-getpid ()
+getpid (void)
 {
   return 0;
 }
 
-sigsetmask ()
+sigsetmask (void)
 {
 }
 
-chdir ()
+chdir (void)
 {
 }
 
 char *
-getcwd (buf, len)
-     char *buf;
-     unsigned int len;
+getcwd (char *buf, unsigned int len)
 {
   buf[0] = '/';
   buf[1] = 0;
@@ -76,12 +74,12 @@ getcwd (buf, len)
 
 /* Used to check for existence of .gdbinit.  Say no.  */
 
-access ()
+access (void)
 {
   return -1;
 }
 
-exit ()
+exit (void)
 {
   error ("Fatal error; restarting.");
 }
@@ -129,9 +127,7 @@ int sourceleft;			/* number of bytes to eof */
 
 int sourcedesc;
 
-open (filename, modes)
-     char *filename;
-     int modes;
+open (char *filename, int modes)
 {
   register char *next;
 
@@ -162,8 +158,7 @@ open (filename, modes)
   return 0;
 }
 
-close (desc)
-     int desc;
+close (int desc)
 {
   sourceptr = 0;
   sourcedesc++;
@@ -173,28 +168,23 @@ close (desc)
 }
 
 FILE *
-fopen (filename, modes)
-     char *filename;
-     char *modes;
+fopen (char *filename, char *modes)
 {
   return (FILE *) open (filename, *modes == 'w');
 }
 
 FILE *
-fdopen (desc)
-     int desc;
+fdopen (int desc)
 {
   return (FILE *) desc;
 }
 
-fclose (desc)
-     int desc;
+fclose (int desc)
 {
   close (desc);
 }
 
-fstat (desc, statbuf)
-     struct stat *statbuf;
+fstat (int desc, struct stat *statbuf)
 {
   if (desc != sourcedesc)
     {
@@ -204,11 +194,7 @@ fstat (desc, statbuf)
   statbuf->st_size = sourcesize;
 }
 
-myread (desc, destptr, size, filename)
-     int desc;
-     char *destptr;
-     int size;
-     char *filename;
+myread (int desc, char *destptr, int size, char *filename)
 {
   int len = min (sourceleft, size);
 
@@ -224,7 +210,7 @@ myread (desc, destptr, size, filename)
 }
 
 int
-fread (bufp, numelts, eltsize, stream)
+fread (int bufp, int numelts, int eltsize, int stream)
 {
   register int elts = min (numelts, sourceleft / eltsize);
   register int len = elts * eltsize;
@@ -241,8 +227,7 @@ fread (bufp, numelts, eltsize, stream)
 }
 
 int
-fgetc (desc)
-     int desc;
+fgetc (int desc)
 {
 
   if (desc == (int) stdin)
@@ -259,9 +244,7 @@ fgetc (desc)
   return *sourceptr++;
 }
 
-lseek (desc, pos)
-     int desc;
-     int pos;
+lseek (int desc, int pos)
 {
 
   if (desc != sourcedesc)
@@ -283,30 +266,29 @@ lseek (desc, pos)
 /* Output in kdb can go only to the terminal, so the stream
    specified may be ignored.  */
 
-printf (a1, a2, a3, a4, a5, a6, a7, a8, a9)
+printf (int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9)
 {
   char buffer[1024];
   sprintf (buffer, a1, a2, a3, a4, a5, a6, a7, a8, a9);
   display_string (buffer);
 }
 
-fprintf (ign, a1, a2, a3, a4, a5, a6, a7, a8, a9)
+fprintf (int ign, int a1, int a2, int a3, int a4, int a5, int a6, int a7,
+	 int a8, int a9)
 {
   char buffer[1024];
   sprintf (buffer, a1, a2, a3, a4, a5, a6, a7, a8, a9);
   display_string (buffer);
 }
 
-fwrite (buf, numelts, size, stream)
-     register char *buf;
-     int numelts, size;
+fwrite (register char *buf, int numelts, int size, int stream)
 {
   register int i = numelts * size;
   while (i-- > 0)
     fputc (*buf++, stream);
 }
 
-fputc (c, ign)
+fputc (int c, int ign)
 {
   char buf[2];
   buf[0] = c;
@@ -318,28 +300,27 @@ fputc (c, ign)
    library would cause fflush to be loaded from it too.
    In fact there should be no need to call this (I hope).  */
 
-_flsbuf ()
+_flsbuf (void)
 {
   error ("_flsbuf was actually called.");
 }
 
-fflush (ign)
+fflush (int ign)
 {
 }
 
 /* Entries into core and inflow, needed only to make things link ok.  */
 
-exec_file_command ()
+exec_file_command (void)
 {
 }
 
-core_file_command ()
+core_file_command (void)
 {
 }
 
 char *
-get_exec_file (err)
-     int err;
+get_exec_file (int err)
 {
   /* Makes one printout look reasonable; value does not matter otherwise.  */
   return "run";
@@ -347,50 +328,44 @@ get_exec_file (err)
 
 /* Nonzero if there is a core file.  */
 
-have_core_file_p ()
+have_core_file_p (void)
 {
   return 0;
 }
 
-kill_command ()
+kill_command (void)
 {
   inferior_pid = 0;
 }
 
-terminal_inferior ()
+terminal_inferior (void)
 {
 }
 
-terminal_ours ()
+terminal_ours (void)
 {
 }
 
-terminal_init_inferior ()
+terminal_init_inferior (void)
 {
 }
 
-write_inferior_register ()
+write_inferior_register (void)
 {
 }
 
-read_inferior_register ()
+read_inferior_register (void)
 {
 }
 
-read_memory (memaddr, myaddr, len)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
+read_memory (CORE_ADDR memaddr, char *myaddr, int len)
 {
   memcpy (myaddr, memaddr, len);
 }
 
 /* Always return 0 indicating success.  */
 
-write_memory (memaddr, myaddr, len)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
+write_memory (CORE_ADDR memaddr, char *myaddr, int len)
 {
   memcpy (memaddr, myaddr, len);
   return 0;
@@ -399,8 +374,7 @@ write_memory (memaddr, myaddr, len)
 static REGISTER_TYPE saved_regs[NUM_REGS];
 
 REGISTER_TYPE
-read_register (regno)
-     int regno;
+read_register (int regno)
 {
   if (regno < 0 || regno >= NUM_REGS)
     error ("Register number %d out of range.", regno);
@@ -408,9 +382,7 @@ read_register (regno)
 }
 
 void
-write_register (regno, value)
-     int regno;
-     REGISTER_TYPE value;
+write_register (int regno, REGISTER_TYPE value)
 {
   if (regno < 0 || regno >= NUM_REGS)
     error ("Register number %d out of range.", regno);
@@ -419,7 +391,7 @@ write_register (regno, value)
 
 /* System calls needed in relation to running the "inferior".  */
 
-vfork ()
+vfork (void)
 {
   /* Just appear to "succeed".  Say the inferior's pid is 1.  */
   return 1;
@@ -429,26 +401,25 @@ vfork ()
    that has just been forked.  That code never runs, when standalone,
    and these definitions are so it will link without errors.  */
 
-ptrace ()
+ptrace (void)
 {
 }
 
-setpgrp ()
+setpgrp (void)
 {
 }
 
-execle ()
+execle (void)
 {
 }
 
-_exit ()
+_exit (void)
 {
 }
 
 /* Malloc calls these.  */
 
-malloc_warning (str)
-     char *str;
+malloc_warning (char *str)
 {
   printf ("\n%s.\n\n", str);
 }
@@ -457,8 +428,7 @@ char *next_free;
 char *memory_limit;
 
 char *
-sbrk (amount)
-     int amount;
+sbrk (int amount)
 {
   if (next_free + amount > memory_limit)
     return (char *) -1;
@@ -469,19 +439,18 @@ sbrk (amount)
 /* Various ways malloc might ask where end of memory is.  */
 
 char *
-ulimit ()
+ulimit (void)
 {
   return memory_limit;
 }
 
 int
-vlimit ()
+vlimit (void)
 {
   return memory_limit - next_free;
 }
 
-getrlimit (addr)
-     struct rlimit *addr;
+getrlimit (struct rlimit *addr)
 {
   addr->rlim_cur = memory_limit - next_free;
 }
@@ -496,7 +465,7 @@ getrlimit (addr)
 static int fault_code;
 static REGISTER_TYPE gdb_stack;
 
-resume ()
+resume (void)
 {
   REGISTER_TYPE restore[NUM_REGS];
 
@@ -508,8 +477,7 @@ resume ()
   /* Control does not drop through here!  */
 }
 
-save_frame_pointer (val)
-     CORE_ADDR val;
+save_frame_pointer (CORE_ADDR val)
 {
   gdb_stack = val;
 }
@@ -520,7 +488,7 @@ save_frame_pointer (val)
    The exact format is machine-dependent and is known only
    in the definition of PUSH_REGISTERS.  */
 
-fault ()
+fault (void)
 {
   /* Transfer all registers and fault code to the stack
      in canonical order: registers in order of GDB register number,
@@ -534,7 +502,7 @@ fault ()
   /* Control does not reach here */
 }
 
-restore_gdb ()
+restore_gdb (void)
 {
   CORE_ADDR new_fp = gdb_stack;
   /* Switch to GDB's stack  */
@@ -546,8 +514,7 @@ restore_gdb ()
    arguments to this function, copy them into the standard place
    for the program's registers while GDB is running.  */
 
-save_registers (firstreg)
-     int firstreg;
+save_registers (int firstreg)
 {
   memcpy (saved_regs, &firstreg, sizeof saved_regs);
   fault_code = (&firstreg)[NUM_REGS];
@@ -560,8 +527,7 @@ save_registers (firstreg)
 static int fault_table[] = FAULT_TABLE;
 
 int
-wait (w)
-     WAITTYPE *w;
+wait (WAITTYPE *w)
 {
   WSETSTOP (*w, fault_table[fault_code / FAULT_CODE_UNITS]);
   return inferior_pid;
@@ -591,7 +557,7 @@ char heap[HEAP_SIZE] =
 int kdb_stack_beg[STACK_SIZE / sizeof (int)];
 int kdb_stack_end;
 
-_initialize_standalone ()
+_initialize_standalone (void)
 {
   register char *next;