import gdb-1999-07-07 post reformat

1 files changed, 110 insertions, 108 deletions

diff --git a/gdb/remote-utils.c b/gdb/remote-utils.c
index 7219255bb6a..1b9ae39970e 100644
--- a/gdb/remote-utils.c
+++ b/gdb/remote-utils.c
@@ -2,42 +2,43 @@
 
    Copyright 1993, 1994, 1998 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   This file is part of GDB.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /*  This file actually contains two distinct logical "packages".  They
-    are packaged together in this one file because they are typically
-    used together.
+   are packaged together in this one file because they are typically
+   used together.
 
-    The first package is an addition to the serial package.  The
-    addition provides reading and writing with debugging output and
-    timeouts based on user settable variables.  These routines are
-    intended to support serial port based remote backends.  These
-    functions are prefixed with sr_.
+   The first package is an addition to the serial package.  The
+   addition provides reading and writing with debugging output and
+   timeouts based on user settable variables.  These routines are
+   intended to support serial port based remote backends.  These
+   functions are prefixed with sr_.
 
-    The second package is a collection of more or less generic
-    functions for use by remote backends.  They support user settable
-    variables for debugging, retries, and the like.  
+   The second package is a collection of more or less generic
+   functions for use by remote backends.  They support user settable
+   variables for debugging, retries, and the like.  
 
    Todo:
 
    * a pass through mode a la kermit or telnet.
    * autobaud.
    * ask remote to change his baud rate.
-   */
+ */
 
 #include <ctype.h>
 
@@ -46,28 +47,29 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "gdbcmd.h"
 #include "target.h"
 #include "serial.h"
-#include "gdbcore.h" /* for exec_bfd */
-#include "inferior.h" /* for generic_mourn_inferior */
+#include "gdbcore.h"		/* for exec_bfd */
+#include "inferior.h"		/* for generic_mourn_inferior */
 #include "remote-utils.h"
 
 
 void _initialize_sr_support PARAMS ((void));
 
-struct _sr_settings sr_settings = {
-  4, /* timeout:
-	remote-hms.c had 2
-	remote-bug.c had "with a timeout of 2, we time out waiting for
-	the prompt after an s-record dump."
-
-	remote.c had (2): This was 5 seconds, which is a long time to
-	sit and wait. Unless this is going though some terminal server
-	or multiplexer or other form of hairy serial connection, I
-	would think 2 seconds would be plenty.
-*/
-
-  10, /* retries */
-  NULL,	/* device */
-  NULL,	/* descriptor */
+struct _sr_settings sr_settings =
+{
+  4,				/* timeout:
+				   remote-hms.c had 2
+				   remote-bug.c had "with a timeout of 2, we time out waiting for
+				   the prompt after an s-record dump."
+
+				   remote.c had (2): This was 5 seconds, which is a long time to
+				   sit and wait. Unless this is going though some terminal server
+				   or multiplexer or other form of hairy serial connection, I
+				   would think 2 seconds would be plenty.
+				 */
+
+  10,				/* retries */
+  NULL,				/* device */
+  NULL,				/* descriptor */
 };
 
 struct gr_settings *gr_settings = NULL;
@@ -76,12 +78,12 @@ static void usage PARAMS ((char *, char *));
 static void sr_com PARAMS ((char *, int));
 
 static void
-usage(proto, junk)
+usage (proto, junk)
      char *proto;
      char *junk;
 {
   if (junk != NULL)
-    fprintf_unfiltered(gdb_stderr, "Unrecognized arguments: `%s'.\n", junk);
+    fprintf_unfiltered (gdb_stderr, "Unrecognized arguments: `%s'.\n", junk);
 
   error ("Usage: target %s [DEVICE [SPEED [DEBUG]]]\n\
 where DEVICE is the name of a device or HOST:PORT", proto, proto);
@@ -101,7 +103,7 @@ where DEVICE is the name of a device or HOST:PORT", proto, proto);
 }
 
 void
-sr_scan_args(proto, args)
+sr_scan_args (proto, args)
      char *proto;
      char *args;
 {
@@ -113,61 +115,61 @@ sr_scan_args(proto, args)
     return;
 
   /* scan off white space.  */
-  for (p = args; isspace(*p); ++p) ;;
+  for (p = args; isspace (*p); ++p);;
 
   /* find end of device name.  */
-  for (q = p; *q != '\0' && !isspace(*q); ++q) ;;
+  for (q = p; *q != '\0' && !isspace (*q); ++q);;
 
   /* check for missing or empty device name.  */
-  CHECKDONE(p, q);
-  sr_set_device(savestring(p, q - p));
+  CHECKDONE (p, q);
+  sr_set_device (savestring (p, q - p));
 
   /* look for baud rate.  */
-  n = strtol(q, &p, 10);
+  n = strtol (q, &p, 10);
 
   /* check for missing or empty baud rate.  */
-  CHECKDONE(p, q);
+  CHECKDONE (p, q);
   baud_rate = n;
 
   /* look for debug value.  */
-  n = strtol(p, &q, 10);
+  n = strtol (p, &q, 10);
 
   /* check for missing or empty debug value.  */
-  CHECKDONE(p, q);
-  sr_set_debug(n);
+  CHECKDONE (p, q);
+  sr_set_debug (n);
 
   /* scan off remaining white space.  */
-  for (p = q; isspace(*p); ++p) ;;
+  for (p = q; isspace (*p); ++p);;
 
   /* if not end of string, then there's unrecognized junk. */
   if (*p != '\0')
-    usage(proto, p);
+    usage (proto, p);
 
   return;
 }
 
 void
-gr_generic_checkin()
+gr_generic_checkin ()
 {
-  sr_write_cr("");
-  gr_expect_prompt();
+  sr_write_cr ("");
+  gr_expect_prompt ();
 }
 
 void
-gr_open(args, from_tty, gr)
+gr_open (args, from_tty, gr)
      char *args;
      int from_tty;
      struct gr_settings *gr;
 {
-  target_preopen(from_tty);
-  sr_scan_args(gr->ops->to_shortname, args);
-  unpush_target(gr->ops);
+  target_preopen (from_tty);
+  sr_scan_args (gr->ops->to_shortname, args);
+  unpush_target (gr->ops);
 
   gr_settings = gr;
 
-  gr_set_dcache(dcache_init(gr->readfunc, gr->writefunc));
+  gr_set_dcache (dcache_init (gr->readfunc, gr->writefunc));
 
-  if (sr_get_desc() != NULL)
+  if (sr_get_desc () != NULL)
     gr_close (0);
 
   /* If no args are specified, then we use the device specified by a
@@ -177,28 +179,28 @@ gr_open(args, from_tty, gr)
   if (sr_get_device () == NULL)
     usage (gr->ops->to_shortname, NULL);
 
-  sr_set_desc(SERIAL_OPEN (sr_get_device()));
-  if (!sr_get_desc())
-    perror_with_name((char *) sr_get_device());
+  sr_set_desc (SERIAL_OPEN (sr_get_device ()));
+  if (!sr_get_desc ())
+    perror_with_name ((char *) sr_get_device ());
 
   if (baud_rate != -1)
     {
-      if (SERIAL_SETBAUDRATE(sr_get_desc(), baud_rate) != 0)
+      if (SERIAL_SETBAUDRATE (sr_get_desc (), baud_rate) != 0)
 	{
-	  SERIAL_CLOSE(sr_get_desc());
-	  perror_with_name(sr_get_device());
+	  SERIAL_CLOSE (sr_get_desc ());
+	  perror_with_name (sr_get_device ());
 	}
     }
 
-  SERIAL_RAW (sr_get_desc());
+  SERIAL_RAW (sr_get_desc ());
 
   /* If there is something sitting in the buffer we might take it as a
      response to a command, which would be bad.  */
   SERIAL_FLUSH_INPUT (sr_get_desc ());
 
   /* default retries */
-  if (sr_get_retries() == 0)
-    sr_set_retries(1);
+  if (sr_get_retries () == 0)
+    sr_set_retries (1);
 
   /* default clear breakpoint function */
   if (gr_settings->clear_all_breakpoints == NULL)
@@ -213,8 +215,8 @@ gr_open(args, from_tty, gr)
       printf_filtered ("\n");
     }
 
-  push_target(gr->ops);
-  gr_checkin();
+  push_target (gr->ops);
+  gr_checkin ();
   gr_clear_all_breakpoints ();
   return;
 }
@@ -227,31 +229,31 @@ sr_readchar ()
 {
   int buf;
 
-  buf = SERIAL_READCHAR (sr_get_desc(), sr_get_timeout());
+  buf = SERIAL_READCHAR (sr_get_desc (), sr_get_timeout ());
 
   if (buf == SERIAL_TIMEOUT)
     error ("Timeout reading from remote system.");
 
-  if (sr_get_debug() > 0)
+  if (sr_get_debug () > 0)
     printf_unfiltered ("%c", buf);
 
   return buf & 0x7f;
 }
 
 int
-sr_pollchar()
+sr_pollchar ()
 {
   int buf;
 
-  buf = SERIAL_READCHAR (sr_get_desc(), 0);
+  buf = SERIAL_READCHAR (sr_get_desc (), 0);
   if (buf == SERIAL_TIMEOUT)
     buf = 0;
-  if (sr_get_debug() > 0)
+  if (sr_get_debug () > 0)
     {
       if (buf)
-        printf_unfiltered ("%c", buf);
+	printf_unfiltered ("%c", buf);
       else
-        printf_unfiltered ("<empty character poll>");
+	printf_unfiltered ("<empty character poll>");
     }
 
   return buf & 0x7f;
@@ -289,10 +291,10 @@ sr_write (a, l)
 {
   int i;
 
-  if (SERIAL_WRITE (sr_get_desc(), a, l) != 0)
+  if (SERIAL_WRITE (sr_get_desc (), a, l) != 0)
     perror_with_name ("sr_write: Error writing to remote");
 
-  if (sr_get_debug() > 0)
+  if (sr_get_debug () > 0)
     for (i = 0; i < l; i++)
       printf_unfiltered ("%c", a[i]);
 
@@ -407,15 +409,15 @@ sr_com (args, fromtty)
 }
 
 void
-gr_close(quitting)
+gr_close (quitting)
      int quitting;
 {
-  gr_clear_all_breakpoints();
+  gr_clear_all_breakpoints ();
 
-  if (sr_is_open())
+  if (sr_is_open ())
     {
-      SERIAL_CLOSE (sr_get_desc());
-      sr_set_desc(NULL);
+      SERIAL_CLOSE (sr_get_desc ());
+      sr_set_desc (NULL);
     }
 
   return;
@@ -430,14 +432,14 @@ gr_close(quitting)
    with your gdb.  */
 
 void
-gr_detach(args, from_tty)
+gr_detach (args, from_tty)
      char *args;
      int from_tty;
 {
   if (args)
     error ("Argument given to \"detach\" when remotely debugging.");
-  
-  if (sr_is_open())
+
+  if (sr_is_open ())
     gr_clear_all_breakpoints ();
 
   pop_target ();
@@ -445,7 +447,7 @@ gr_detach(args, from_tty)
     puts_filtered ("Ending remote debugging.\n");
 
   return;
-}  
+}
 
 void
 gr_files_info (ops)
@@ -454,7 +456,7 @@ gr_files_info (ops)
 #ifdef __GO32__
   printf_filtered ("\tAttached to DOS asynctsr\n");
 #else
-  printf_filtered ("\tAttached to %s", sr_get_device());
+  printf_filtered ("\tAttached to %s", sr_get_device ());
   if (baud_rate != -1)
     printf_filtered ("at %d baud", baud_rate);
   printf_filtered ("\n");
@@ -472,7 +474,7 @@ void
 gr_mourn ()
 {
   gr_clear_all_breakpoints ();
-  unpush_target (gr_get_ops());
+  unpush_target (gr_get_ops ());
   generic_mourn_inferior ();
 }
 
@@ -505,7 +507,7 @@ gr_create_inferior (execfile, args, env)
   gr_clear_all_breakpoints ();
 
   init_wait_for_inferior ();
-  gr_checkin();
+  gr_checkin ();
 
   insert_breakpoints ();	/* Needed to get correct instruction in cache */
   proceed (entry_pt, -1, 0);
@@ -523,8 +525,8 @@ gr_multi_scan (list, passthrough)
      char *list[];
      int passthrough;
 {
-  char *swallowed = NULL; /* holding area */
-  char *swallowed_p = swallowed; /* Current position in swallowed.  */
+  char *swallowed = NULL;	/* holding area */
+  char *swallowed_p = swallowed;	/* Current position in swallowed.  */
   int ch;
   int ch_handled;
   int i;
@@ -539,7 +541,7 @@ gr_multi_scan (list, passthrough)
        list[i] != NULL;
        ++i, ++string_count)
     {
-      int length = strlen(list[i]);
+      int length = strlen (list[i]);
 
       if (length > max_length)
 	max_length = length;
@@ -547,22 +549,22 @@ gr_multi_scan (list, passthrough)
 
   /* if we have no strings, then something is wrong. */
   if (string_count == 0)
-    return(-1);
+    return (-1);
 
   /* otherwise, we will need a holding area big enough to hold almost two
      copies of our largest string.  */
-  swallowed_p = swallowed = alloca(max_length << 1);
+  swallowed_p = swallowed = alloca (max_length << 1);
 
   /* and a list of pointers to current scan points. */
-  plist = (char **) alloca (string_count * sizeof(*plist));
+  plist = (char **) alloca (string_count * sizeof (*plist));
 
   /* and initialize */
   for (i = 0; i < string_count; ++i)
     plist[i] = list[i];
 
-  for (ch = sr_readchar(); /* loop forever */ ; ch = sr_readchar())
+  for (ch = sr_readchar (); /* loop forever */ ; ch = sr_readchar ())
     {
-      QUIT; /* Let user quit and leave process running */
+      QUIT;			/* Let user quit and leave process running */
       ch_handled = 0;
 
       for (i = 0; i < string_count; ++i)
@@ -571,7 +573,7 @@ gr_multi_scan (list, passthrough)
 	    {
 	      ++plist[i];
 	      if (*plist[i] == '\0')
-		return(i);
+		return (i);
 
 	      if (!ch_handled)
 		*swallowed_p++ = ch;
@@ -600,7 +602,7 @@ gr_multi_scan (list, passthrough)
     }
 #if 0
   /* Never reached.  */
-  return(-1);
+  return (-1);
 #endif
 }
 
@@ -623,7 +625,7 @@ int
 gr_fetch_word (addr)
      CORE_ADDR addr;
 {
-  return dcache_fetch (gr_get_dcache(), addr);
+  return dcache_fetch (gr_get_dcache (), addr);
 }
 
 /* Write a word WORD into remote address ADDR.
@@ -634,7 +636,7 @@ gr_store_word (addr, word)
      CORE_ADDR addr;
      int word;
 {
-  dcache_poke (gr_get_dcache(), addr, word);
+  dcache_poke (gr_get_dcache (), addr, word);
 }
 
 void
@@ -642,7 +644,7 @@ _initialize_sr_support ()
 {
 /* FIXME-now: if target is open... */
   add_show_from_set (add_set_cmd ("remotedevice", no_class,
-				  var_filename, (char *)&sr_settings.device,
+				  var_filename, (char *) &sr_settings.device,
 				  "Set device for remote serial I/O.\n\
 This device is used as the serial port when debugging using remote\n\
 targets.", &setlist),