[RFA/RFC] printf (stderr,... ->fprintf_unfiltered (gdb_stderr,... in remote*.c

[RFA/RFC] printf (stderr,... ->fprintf_unfiltered (gdb_stderr,... in remote*.c

[Pierre Muller]

This is one of the files that I listed in
http://sources.redhat.com/ml/gdb/2002-02/msg00212.html
as still having direct uses of stderr.

  I don't even know if this is correct,
because I don't know if the gdb_std???
should be used in these files.

remote-array.c seems to also use gdb_stdout
so that one should be correct.

remote-es.c has no other reference to gdb_std???
variables, so here it could well be an error to do that change.

Idem for remote-os9k.c and remote-st.c.


ChangeLog entry:

2002-04-24  Pierre Muller  <ics.u-strasbg.fr>
	* remote-array.c (printf_monitor, write_monitor,
	array_insert_breakpoint, array_remove_breakpoint ): 
	Replace fprintf (stderr,...
	with fprintf_unfiltered (gdb_stderr,....
	* remote-es.c: Likewise.
	* remote-os9k.c: Likewise.
	* remote-st.c: Likewise.


Index: remote-array.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-array.c,v
retrieving revision 1.18
diff -u -p -r1.18 remote-array.c
--- remote-array.c	19 Jan 2002 03:32:37 -0000	1.18
+++ remote-array.c	24 Apr 2002 12:41:19 -0000
@@ -193,7 +193,7 @@ printf_monitor (char *pattern,...)
    if (strlen (buf) > PBUFSIZ)
      error ("printf_monitor(): string too long");
    if (serial_write (array_desc, buf, strlen (buf)))
-    fprintf (stderr, "serial_write failed: %s\n", safe_strerror (errno));
+    fprintf_unfiltered (gdb_stderr, "serial_write failed: %s\n", safe_strerror (errno));
  }
  /*
   * write_monitor -- send raw data to monitor.
@@ -202,7 +202,7 @@ static void
  write_monitor (char data[], int len)
  {
    if (serial_write (array_desc, data, len))
-    fprintf (stderr, "serial_write failed: %s\n", safe_strerror (errno));
+    fprintf_unfiltered (gdb_stderr, "serial_write failed: %s\n", safe_strerror (errno));
  
    *(data + len + 1) = '\0';
    debuglogs (1, "write_monitor(), Sending: \"%s\".", data);
@@ -1053,7 +1053,7 @@ array_insert_breakpoint (CORE_ADDR addr,
  	}
      }
  
-  fprintf (stderr, "Too many breakpoints (> 16) for monitor\n");
+  fprintf_unfiltered (gdb_stderr, "Too many breakpoints (> 16) for monitor\n");
    return 1;
  }
  
@@ -1078,7 +1078,7 @@ array_remove_breakpoint (CORE_ADDR addr,
  	  return 0;
  	}
      }
-  fprintf (stderr, "Can't find breakpoint associated with 0x%s\n",
+  fprintf_unfiltered (gdb_stderr, "Can't find breakpoint associated with 0x%s\n",
  	   paddr_nz (addr));
    return 1;
  }
Index: remote-es.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-es.c,v
retrieving revision 1.20
diff -u -p -r1.20 remote-es.c
--- remote-es.c	19 Jan 2002 03:32:37 -0000	1.20
+++ remote-es.c	24 Apr 2002 12:41:19 -0000
@@ -1616,7 +1616,7 @@ send (char *string)
  {
    if (kiodebug)
      {
-      fprintf (stderr, "Sending: %s\n", string);
+      fprintf_unfiltered (gdb_stderr, "Sending: %s\n", string);
      }
    serial_write (es1800_desc, string, strlen (string));
  }
@@ -1663,7 +1663,7 @@ getmessage (char *buf, int len)
  
    if (kiodebug)
      {
-      fprintf (stderr, "message received :%s\n", buf);
+      fprintf_unfiltered (gdb_stderr, "message received :%s\n", buf);
      }
  }
  
Index: remote-os9k.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-os9k.c,v
retrieving revision 1.18
diff -u -p -r1.18 remote-os9k.c
--- remote-os9k.c	19 Jan 2002 03:32:38 -0000	1.18
+++ remote-os9k.c	24 Apr 2002 12:41:19 -0000
@@ -101,7 +101,7 @@ printf_monitor (char *pattern,...)
    va_end (args);
  
    if (serial_write (monitor_desc, buf, strlen (buf)))
-    fprintf (stderr, "serial_write failed: %s\n", safe_strerror (errno));
+    fprintf_unfiltered (gdb_stderr, "serial_write failed: %s\n", safe_strerror (errno));
  }
  
  /* Read a character from the remote system, doing all the fancy timeout stuff */
@@ -380,9 +380,9 @@ rombug_close (int quitting)
    if (log_file)
      {
        if (ferror (log_file))
-	fprintf (stderr, "Error writing log file.\n");
+	fprintf_unfiltered (gdb_stderr, "Error writing log file.\n");
        if (fclose (log_file) != 0)
-	fprintf (stderr, "Error closing log file.\n");
+	fprintf_unfiltered (gdb_stderr, "Error closing log file.\n");
        log_file = 0;
      }
  }
@@ -883,7 +883,7 @@ rombug_insert_breakpoint (CORE_ADDR addr
  	return 0;
        }
  
-  fprintf (stderr, "Too many breakpoints (> 16) for monitor\n");
+  fprintf_unfiltered (gdb_stderr, "Too many breakpoints (> 16) for monitor\n");
    return 1;
  }
  
@@ -908,7 +908,7 @@ rombug_remove_breakpoint (CORE_ADDR addr
  	return 0;
        }
  
-  fprintf (stderr, "Can't find breakpoint associated with 0x%x\n", addr);
+  fprintf_unfiltered (gdb_stderr, "Can't find breakpoint associated with 0x%x\n", addr);
    return 1;
  }
  
@@ -949,7 +949,7 @@ rombug_load (char *arg)
  
        if (serial_write (monitor_desc, buf, bytes_read))
  	{
-	  fprintf (stderr, "serial_write failed: (while downloading) %s\n", safe_strerror (errno));
+	  fprintf_unfiltered (gdb_stderr, "serial_write failed: (while downloading) %s\n", safe_strerror (errno));
  	  break;
  	}
        i = 0;
Index: remote-st.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-st.c,v
retrieving revision 1.16
diff -u -p -r1.16 remote-st.c
--- remote-st.c	19 Jan 2002 03:32:39 -0000	1.16
+++ remote-st.c	24 Apr 2002 12:41:19 -0000
@@ -79,7 +79,7 @@ printf_stdebug (char *pattern,...)
    va_end (args);
  
    if (serial_write (st2000_desc, buf, strlen (buf)))
-    fprintf (stderr, "serial_write failed: %s\n", safe_strerror (errno));
+    fprintf_unfiltered (gdb_stderr, "serial_write failed: %s\n", safe_strerror (errno));
  }
  
  /* Read a character from the remote system, doing all the fancy timeout
@@ -324,9 +324,9 @@ st2000_close (int quitting)
    if (log_file)
      {
        if (ferror (log_file))
-	fprintf (stderr, "Error writing log file.\n");
+	fprintf_unfiltered (gdb_stderr, "Error writing log file.\n");
        if (fclose (log_file) != 0)
-	fprintf (stderr, "Error closing log file.\n");
+	fprintf_unfiltered (gdb_stderr, "Error closing log file.\n");
      }
  #endif
  }
@@ -616,7 +616,7 @@ st2000_insert_breakpoint (CORE_ADDR addr
  	return 0;
        }
  
-  fprintf (stderr, "Too many breakpoints (> 16) for STDBUG\n");
+  fprintf_unfiltered (gdb_stderr, "Too many breakpoints (> 16) for STDBUG\n");
    return 1;
  }
  
@@ -635,7 +635,7 @@ st2000_remove_breakpoint (CORE_ADDR addr
  	return 0;
        }
  
-  fprintf (stderr, "Can't find breakpoint associated with 0x%x\n", addr);
+  fprintf_unfiltered (gdb_stderr, "Can't find breakpoint associated with 0x%x\n", addr);
    return 1;
  }
  

Re: [RFA/RFC] printf (stderr,... ->fprintf_unfiltered (gdb_stderr,... in remote*.c

[Andrew Cagney]

> This is one of the files that I listed in
> http://sources.redhat.com/ml/gdb/2002-02/msg00212.html
> as still having direct uses of stderr.
> 
>   I don't even know if this is correct,
> because I don't know if the gdb_std???
> should be used in these files.

It should be used everywhere, so yes it is fine.

> remote-array.c seems to also use gdb_stdout
> so that one should be correct.

Yes.

(Eventually GDB needs to audit all its error/output messages and decide 
which should go where.  That, however, is a separate problem.  Probably 
something to do if/when i18n occures.)

> remote-es.c has no other reference to gdb_std???
> variables, so here it could well be an error to do that change.
> 
> Idem for remote-os9k.c and remote-st.c.

These can also also be changed.  gdb_stderr is defined in defs.h, so it 
is visible.

good one,
Andrew

Re: [RFA/RFC] printf (stderr,... ->fprintf_unfiltered (gdb_stderr,... in remote*.c

[Pierre Muller]

At 17:50 25/04/2002 , Andrew Cagney a écrit:
>>This is one of the files that I listed in
>>http://sources.redhat.com/ml/gdb/2002-02/msg00212.html
>>as still having direct uses of stderr.
>>   I don't even know if this is correct,
>>because I don't know if the gdb_std???
>>should be used in these files.
>
>It should be used everywhere, so yes it is fine.
>
>>remote-array.c seems to also use gdb_stdout
>>so that one should be correct.
>
>Yes.
>
>(Eventually GDB needs to audit all its error/output messages and decide which should go where.  That, however, is a separate problem.  Probably something to do if/when i18n occures.)
>
>>remote-es.c has no other reference to gdb_std???
>>variables, so here it could well be an error to do that change.
>>Idem for remote-os9k.c and remote-st.c.
>
>These can also also be changed.  gdb_stderr is defined in defs.h, so it is visible.

Can I commit the whole together then?



Pierre Muller
Institut Charles Sadron
6,rue Boussingault
F 67083 STRASBOURG CEDEX (France)
mailto:muller@ics.u-strasbg.fr
Phone : (33)-3-88-41-40-07  Fax : (33)-3-88-41-40-99

Re: [RFA/RFC] printf (stderr,... ->fprintf_unfiltered (gdb_stderr,... in remote*.c

[Andrew Cagney]

> These can also also be changed.  gdb_stderr is defined in defs.h, so it is visible.
> 
> 
> Can I commit the whole together then?

yep

Andrew

[RFA 2nd] remote-*.c printf (stderr,... ->fprintf_unfiltered (gdb_stderr,...

[Pierre Muller]

At 19:17 25/04/2002 , Andrew Cagney a écrit:
>>These can also also be changed.  gdb_stderr is defined in defs.h, so it is visible.
>>
>>Can I commit the whole together then?
>
>yep

I send here a second version of the patch that also 
includes formatting to avoid lines longer than 80 chars.

So this patch replaces
[RFA/RFC] printf (stderr,... ->fprintf_unfiltered (gdb_stderr,... in remote*.c
http://sources.redhat.com/ml/gdb-patches/2002-04/msg00931.html


One important remark is that I don't even know how 
I should run configure in order to be able to compile
these files :(
Thus I couldn't test all of these files
(some compiled, others not because of wrong configuration...)

Andrew, can I commit this even without having compiled them?


ChangeLog entry:

2002-04-24  Pierre Muller  <ics.u-strasbg.fr>

         * remote-array.c (printf_monitor, write_monitor,
         array_insert_breakpoint, array_remove_breakpoint ): 
         Replace fprintf (stderr,...
         with fprintf_unfiltered (gdb_stderr,....
         * remote-es.c: Likewise.
         * remote-os9k.c: Likewise.
         * remote-st.c: Likewise.




Index: remote-array.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-array.c,v
retrieving revision 1.18
diff -u -p -r1.18 remote-array.c
--- remote-array.c      19 Jan 2002 03:32:37 -0000      1.18
+++ remote-array.c      26 Apr 2002 08:23:57 -0000
@@ -193,7 +193,8 @@ printf_monitor (char *pattern,...)
    if (strlen (buf) > PBUFSIZ)
      error ("printf_monitor(): string too long");
    if (serial_write (array_desc, buf, strlen (buf)))
-    fprintf (stderr, "serial_write failed: %s\n", safe_strerror (errno));
+    fprintf_unfiltered (gdb_stderr, "serial_write failed: %s\n",
+                       safe_strerror (errno));
  }
  /*
   * write_monitor -- send raw data to monitor.
@@ -202,7 +203,8 @@ static void
  write_monitor (char data[], int len)
  {
    if (serial_write (array_desc, data, len))
-    fprintf (stderr, "serial_write failed: %s\n", safe_strerror (errno));
+    fprintf_unfiltered (gdb_stderr, "serial_write failed: %s\n",
+                       safe_strerror (errno));

    *(data + len + 1) = '\0';
    debuglogs (1, "write_monitor(), Sending: \"%s\".", data);
@@ -1053,7 +1055,7 @@ array_insert_breakpoint (CORE_ADDR addr,
         }
      }

-  fprintf (stderr, "Too many breakpoints (> 16) for monitor\n");
+  fprintf_unfiltered (gdb_stderr, "Too many breakpoints (> 16) for monitor\n");

    return 1;
  }

@@ -1078,8 +1080,9 @@ array_remove_breakpoint (CORE_ADDR addr,
           return 0;
         }
      }
-  fprintf (stderr, "Can't find breakpoint associated with 0x%s\n",
-          paddr_nz (addr));
+  fprintf_unfiltered (gdb_stderr,
+                     "Can't find breakpoint associated with 0x%s\n",
+                     paddr_nz (addr));
    return 1;
  }

Index: remote-es.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-es.c,v
retrieving revision 1.20
diff -u -p -r1.20 remote-es.c
--- remote-es.c 19 Jan 2002 03:32:37 -0000      1.20
+++ remote-es.c 26 Apr 2002 08:23:57 -0000
@@ -1616,7 +1616,7 @@ send (char *string)
  {
    if (kiodebug)
      {
-      fprintf (stderr, "Sending: %s\n", string);
+      fprintf_unfiltered (gdb_stderr, "Sending: %s\n", string);
      }
    serial_write (es1800_desc, string, strlen (string));
  }
@@ -1663,7 +1663,7 @@ getmessage (char *buf, int len)

    if (kiodebug)
      {
-      fprintf (stderr, "message received :%s\n", buf);
+      fprintf_unfiltered (gdb_stderr, "message received :%s\n", buf);
      }
  }

Index: remote-os9k.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-os9k.c,v
retrieving revision 1.18
diff -u -p -r1.18 remote-os9k.c
--- remote-os9k.c       19 Jan 2002 03:32:38 -0000      1.18
+++ remote-os9k.c       26 Apr 2002 08:23:58 -0000
@@ -101,7 +101,8 @@ printf_monitor (char *pattern,...)
    va_end (args);

    if (serial_write (monitor_desc, buf, strlen (buf)))
-    fprintf (stderr, "serial_write failed: %s\n", safe_strerror (errno));
+    fprintf_unfiltered (gdb_stderr, "serial_write failed: %s\n",
+                       safe_strerror (errno));
  }

  /* Read a character from the remote system, doing all the fancy timeout stuff *
/
@@ -380,9 +381,9 @@ rombug_close (int quitting)
    if (log_file)
      {
        if (ferror (log_file))
-       fprintf (stderr, "Error writing log file.\n");
+       fprintf_unfiltered (gdb_stderr, "Error writing log file.\n");
        if (fclose (log_file) != 0)
-       fprintf (stderr, "Error closing log file.\n");
+       fprintf_unfiltered (gdb_stderr, "Error closing log file.\n");
        log_file = 0;
      }
  }
@@ -883,7 +884,7 @@ rombug_insert_breakpoint (CORE_ADDR addr
         return 0;
        }

-  fprintf (stderr, "Too many breakpoints (> 16) for monitor\n");
+  fprintf_unfiltered (gdb_stderr, "Too many breakpoints (> 16) for monitor\n");

    return 1;
  }

@@ -908,7 +909,8 @@ rombug_remove_breakpoint (CORE_ADDR addr
         return 0;
        }

-  fprintf (stderr, "Can't find breakpoint associated with 0x%x\n", addr);
+  fprintf_unfiltered (gdb_stderr,
+                     "Can't find breakpoint associated with 0x%x\n", addr);
    return 1;
  }

@@ -949,7 +951,9 @@ rombug_load (char *arg)

        if (serial_write (monitor_desc, buf, bytes_read))
         {
-         fprintf (stderr, "serial_write failed: (while downloading) %s\n", safe
_strerror (errno));
+         fprintf_unfiltered (gdb_stderr,
+                             "serial_write failed: (while downloading) %s\n",
+                             safe_strerror (errno));
           break;
         }
        i = 0;
Index: remote-st.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-st.c,v
retrieving revision 1.16
diff -u -p -r1.16 remote-st.c
--- remote-st.c 19 Jan 2002 03:32:39 -0000      1.16
+++ remote-st.c 26 Apr 2002 08:23:58 -0000
@@ -79,7 +79,8 @@ printf_stdebug (char *pattern,...)
    va_end (args);

    if (serial_write (st2000_desc, buf, strlen (buf)))
-    fprintf (stderr, "serial_write failed: %s\n", safe_strerror (errno));
+    fprintf_unfiltered (gdb_stderr, "serial_write failed: %s\n",
+                       safe_strerror (errno));
  }

  /* Read a character from the remote system, doing all the fancy timeout
@@ -324,9 +325,9 @@ st2000_close (int quitting)
    if (log_file)
      {
        if (ferror (log_file))
-       fprintf (stderr, "Error writing log file.\n");
+       fprintf_unfiltered (gdb_stderr, "Error writing log file.\n");
        if (fclose (log_file) != 0)
-       fprintf (stderr, "Error closing log file.\n");
+       fprintf_unfiltered (gdb_stderr, "Error closing log file.\n");
      }
  #endif
  }
@@ -616,7 +617,7 @@ st2000_insert_breakpoint (CORE_ADDR addr
         return 0;
        }

-  fprintf (stderr, "Too many breakpoints (> 16) for STDBUG\n");
+  fprintf_unfiltered (gdb_stderr, "Too many breakpoints (> 16) for STDBUG\n");
    return 1;
  }

@@ -635,7 +636,8 @@ st2000_remove_breakpoint (CORE_ADDR addr
         return 0;
        }

-  fprintf (stderr, "Can't find breakpoint associated with 0x%x\n", addr);
+  fprintf_unfiltered (gdb_stderr,
+                     "Can't find breakpoint associated with 0x%x\n", addr);
    return 1;
  }




Pierre Muller
Institut Charles Sadron
6,rue Boussingault
F 67083 STRASBOURG CEDEX (France)
mailto:muller@ics.u-strasbg.fr
Phone : (33)-3-88-41-40-07  Fax : (33)-3-88-41-40-99

Re: [RFA 2nd] remote-*.c printf (stderr,... ->fprintf_unfiltered (gdb_stderr,...

[Andrew Cagney]

Hmm,

Using this trick:

ac131313@nettle$ find | xargs grep remote-os9k.o
Makefile.in:remote-os9k.o: remote-os9k.c $(defs_h) $(gdbcore_h) \
config/i386/i386os9k.mt:TDEPFILES= i386-tdep.o remote-os9k.o
ac131313@nettle$ grep i386os9k configure.tgt
i[3456]86-*-os9k)       gdb_target=i386os9k ;;

remote-array.c can be checked with --target=mips-elf.

remote-os9k.c, remote-es.c and remote-st.c are each for obscure m68k 
systems (building m68k-elf won't check them and it can't break m68k 
GNU/Linux).

Can I suggest also filing a bug report noteing the possability of 
dropping support for:
m68*-ericsson-*)        gdb_target=es1800 ;;
i[3456]86-*-os9k)       gdb_target=i386os9k ;;
m68*-tandem-*)          gdb_target=st2000 ;;
(I said they were obscure :-)

So if mips-elf builds then yes, it can go on.

Andrew

Re: [RFA 2nd] remote-*.c printf (stderr,... ->fprintf_unfiltered (gdb_stderr,...

[Pierre Muller]

At 15:11 26/04/2002 , Andrew Cagney a écrit:
>Hmm,
>
>Using this trick:
>
>ac131313@nettle$ find | xargs grep remote-os9k.o
>Makefile.in:remote-os9k.o: remote-os9k.c $(defs_h) $(gdbcore_h) \
>config/i386/i386os9k.mt:TDEPFILES= i386-tdep.o remote-os9k.o
>ac131313@nettle$ grep i386os9k configure.tgt
>i[3456]86-*-os9k)       gdb_target=i386os9k ;;
>
>remote-array.c can be checked with --target=mips-elf.
>
>remote-os9k.c, remote-es.c and remote-st.c are each for obscure m68k systems (building m68k-elf won't check them and it can't break m68k GNU/Linux).
>
>Can I suggest also filing a bug report noteing the possability of dropping support for:
>m68*-ericsson-*)        gdb_target=es1800 ;;
>i[3456]86-*-os9k)       gdb_target=i386os9k ;;
>m68*-tandem-*)          gdb_target=st2000 ;;
>(I said they were obscure :-)
>
>So if mips-elf builds then yes, it can go on.

If I do a 
mkdir buildmips
cd buildmips
../src/configure --target=mips-linux-elf
make all-gdb
then 
remote-array.o is compiled without any warning.

I also checked the remote-os9k.o with
mkdir buildos9k
cd buildos9k
../src/configure --target=i386-unknown-os9k
mkdir gdb
cd gdb
../../src/gdb/configure --target=i386-unknown-os9k
  make

Here I get lots of errors in compilation
of remote-os9k.o 
but none seems to be related to my changes...


>Andrew

Thus I committed the whole as you stated.


Pierre Muller
Institut Charles Sadron
6,rue Boussingault
F 67083 STRASBOURG CEDEX (France)
mailto:muller@ics.u-strasbg.fr
Phone : (33)-3-88-41-40-07  Fax : (33)-3-88-41-40-99