HPMERGE:

Pass gdb_stderr instead of stderr.
In serial.c, fix call to gdb_fclose() - pass gdb_file** not gdb_file*

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d8e9b8e442d2bd73df061de8841d8e5508473386..3699b7b352e8fd0d730ab3353ee05030ad6f5346 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan 18 12:03:47 1999  Andrew Cagney  <cagney@b1.cygnus.com>
+
+       * serial.c (serial_close): gdb_fclose tages gdb_file** arg, not
+       gdb_file*.
+
+       * f-valprint.c, target.c, gdbarch.c: Pass gdb_stderr not stderr.
+
 Mon Jan 18 10:46:12 1999  Andrew Cagney  <cagney@b1.cygnus.com>
 
        * stack.c (print_frame_info_base): Don't cast call to

diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 23331b10d348a84000833320e427410019ebd8f1..bb0b1d0efb1b42cfb7422058c6949a28f772fc38 100644 (file)
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -681,7 +681,7 @@ info_common_command (comname, from_tty)
       while (entry != NULL)
        {
          printf_filtered ("%s = ",SYMBOL_NAME(entry->symbol)); 
-         print_variable_value (entry->symbol,fi,stdout); 
+         print_variable_value (entry->symbol, fi, gdb_stdout); 
          printf_filtered ("\n"); 
          entry = entry->next; 
        }

diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 4fa8653cda06524c0a15f1baf10dae4dc42a6fe7..272362f88c9eb9263c5d5e142fe7fd9f78f95638 100644 (file)
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -374,7 +374,7 @@ register_gdbarch_init (bfd_architecture, init)
     }
   /* log it */
   if (gdbarch_debug)
-    fprintf_unfiltered (stderr, "register_gdbarch_init (%s, 0x%08lx)\n",
+    fprintf_unfiltered (gdb_stderr, "register_gdbarch_init (%s, 0x%08lx)\n",
                        bfd_arch_info->printable_name,
                        (long) init);
   /* Append it */
@@ -474,31 +474,31 @@ gdbarch_update (info)
   if (rego == NULL)
     {
       if (gdbarch_debug)
-       fprintf_unfiltered (stderr, "gdbarch_update: No matching architecture\n");
+       fprintf_unfiltered (gdb_stderr, "gdbarch_update: No matching architecture\n");
       return 0;
     }
 
   if (gdbarch_debug)
     {
-      fprintf_unfiltered (stderr,
+      fprintf_unfiltered (gdb_stderr,
                          "gdbarch_update: info.bfd_architecture %d (%s)\n",
                          info.bfd_architecture,
                          bfd_lookup_arch (info.bfd_architecture, 0)->printable_name);
-      fprintf_unfiltered (stderr,
+      fprintf_unfiltered (gdb_stderr,
                          "gdbarch_update: info.bfd_arch_info %s\n",
                          (info.bfd_arch_info != NULL
                           ? info.bfd_arch_info->printable_name
                           : "(null)"));
-      fprintf_unfiltered (stderr,
+      fprintf_unfiltered (gdb_stderr,
                          "gdbarch_update: info.byte_order %d (%s)\n",
                          info.byte_order,
                          (info.byte_order == BIG_ENDIAN ? "big"
                           : info.byte_order == LITTLE_ENDIAN ? "little"
                           : "default"));
-      fprintf_unfiltered (stderr,
+      fprintf_unfiltered (gdb_stderr,
                          "gdbarch_update: info.abfd 0x%lx\n",
                          (long) info.abfd);
-      fprintf_unfiltered (stderr,
+      fprintf_unfiltered (gdb_stderr,
                          "gdbarch_update: info.tdep_info 0x%lx\n",
                          (long) info.tdep_info);
     }
@@ -510,7 +510,7 @@ gdbarch_update (info)
   if (new_gdbarch == NULL)
     {
       if (gdbarch_debug)
-       fprintf_unfiltered (stderr, "gdbarch_update: Target rejected architecture\n");
+       fprintf_unfiltered (gdb_stderr, "gdbarch_update: Target rejected architecture\n");
       return 0;
     }
 
@@ -518,7 +518,7 @@ gdbarch_update (info)
   if (current_gdbarch == new_gdbarch)
     {
       if (gdbarch_debug)
-       fprintf_unfiltered (stderr, "gdbarch_update: Architecture 0x%08lx (%s) unchanged\n",
+       fprintf_unfiltered (gdb_stderr, "gdbarch_update: Architecture 0x%08lx (%s) unchanged\n",
                            (long) new_gdbarch,
                            new_gdbarch->bfd_arch_info->printable_name);
       return 1;
@@ -535,7 +535,7 @@ gdbarch_update (info)
       if ((*list)->gdbarch == new_gdbarch)
        {
          if (gdbarch_debug)
-           fprintf_unfiltered (stderr, "gdbarch_update: Previous architecture 0x%08lx (%s) selected\n",
+           fprintf_unfiltered (gdb_stderr, "gdbarch_update: Previous architecture 0x%08lx (%s) selected\n",
                                (long) new_gdbarch,
                                new_gdbarch->bfd_arch_info->printable_name);
          current_gdbarch = new_gdbarch;
@@ -553,23 +553,23 @@ gdbarch_update (info)
   current_gdbarch = new_gdbarch;
   if (gdbarch_debug)
     {
-      fprintf_unfiltered (stderr,
+      fprintf_unfiltered (gdb_stderr,
                          "gdbarch_update: New architecture 0x%08lx (%s) selected\n",
                          (long) new_gdbarch,
                          new_gdbarch->bfd_arch_info->printable_name);
-      fprintf_unfiltered (stderr,
+      fprintf_unfiltered (gdb_stderr,
                          "gdbarch_update: TARGET_BYTE_ORDER = %d (%s)\n",
                          TARGET_BYTE_ORDER,
                          (TARGET_BYTE_ORDER == BIG_ENDIAN ? "big"
                           : TARGET_BYTE_ORDER == LITTLE_ENDIAN ? "little"
                           : "default"));
-      fprintf_unfiltered (stderr,
+      fprintf_unfiltered (gdb_stderr,
                          "gdbarch_update: TARGET_LONG_BIT = %d\n",
                          TARGET_LONG_BIT);
-      fprintf_unfiltered (stderr,
+      fprintf_unfiltered (gdb_stderr,
                          "gdbarch_update: TARGET_LONG_LONG_BIT = %d\n",
                          TARGET_LONG_LONG_BIT);
-      fprintf_unfiltered (stderr,
+      fprintf_unfiltered (gdb_stderr,
                          "gdbarch_update: TARGET_PTR_BIT = %d\n",
                          TARGET_PTR_BIT);
     }

diff --git a/gdb/serial.c b/gdb/serial.c
index 7e182cf88016473f80bc8259addf9dde899846ce..ce420eeadd2825cd633268122f389667af11d1ab 100644 (file)
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -309,7 +309,7 @@ serial_close (scb, really_close)
       serial_current_type = 0;
 
       /* XXX - What if serial_logfp == gdb_stdout or gdb_stderr? */
-      gdb_fclose (serial_logfp); 
+      gdb_fclose (&serial_logfp); 
       serial_logfp = NULL;
     }
 

diff --git a/gdb/target.c b/gdb/target.c
index a13bbc3a72091bdd489d3c3d754727c9b55770eb..4d9f3e9b07076794e970d975403f6279d73f3f8f 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -2487,7 +2487,7 @@ debug_to_query (type, req, resp, siz)
 
   retval = debug_target.to_query (type, req, resp, siz);
 
-  fprintf_unfiltered (stderr, "target_query (%c, %s, %s,  %d) = %d\n", type, req, resp, *siz, retval);
+  fprintf_unfiltered (gdb_stderr, "target_query (%c, %s, %s,  %d) = %d\n", type, req, resp, *siz, retval);
 
   return retval;
 }