From ba4d67c2bff4b9d754ace1c0854c0bcfd04d000e Mon Sep 17 00:00:00 2001
From: Fernando Nasser <fnasser@redhat.com>
Date: Tue, 19 Jan 1999 20:45:31 +0000
Subject: [PATCH] 1999-01-19  Fernando Nasser  <fnasser@totem.to.cygnus.com>

	* sol-thread.c abug-rom.c cpu32bug-rom.c dbug-rom.c m32r-rom.c
	mac-nat.c mon960-rom.c op50-rom.c ppc-bdm.c remote-adapt.c
	remote-array.c remote-bug.c remote-e7000.c remote-eb.c remote-es.c
	remote-est.c remote-hms.c remote-mm.c remote-nindy.c remote-nrom.c
	remote-os9k.c remote-rdp.c remote-sds.c remote-sim.c remote-st.c
	remote-udi.c rom68k-rom.c sh3-rom.c sparcl-tdep.c sparclet-rom.c
	v850ice.c win32-nat.c: cosmetic changes to conform to coding
	standards.
---
 gdb/abug-rom.c     |  3 ++-
 gdb/cpu32bug-rom.c |  4 +++-
 gdb/dbug-rom.c     |  3 ++-
 gdb/mac-nat.c      |  4 +++-
 gdb/mon960-rom.c   |  4 +++-
 gdb/op50-rom.c     |  4 +++-
 gdb/ppc-bdm.c      |  3 ++-
 gdb/remote-adapt.c |  4 +++-
 gdb/remote-array.c |  4 +++-
 gdb/remote-bug.c   |  3 ++-
 gdb/remote-eb.c    |  4 +++-
 gdb/remote-es.c    |  8 ++++++--
 gdb/remote-est.c   |  4 +++-
 gdb/remote-hms.c   |  8 ++++++--
 gdb/remote-mm.c    |  3 ++-
 gdb/remote-nindy.c |  4 +++-
 gdb/remote-nrom.c  |  4 +++-
 gdb/remote-os9k.c  |  3 ++-
 gdb/remote-rdp.c   |  3 ++-
 gdb/remote-sds.c   |  3 ++-
 gdb/remote-sim.c   |  4 +++-
 gdb/remote-st.c    |  3 ++-
 gdb/remote-udi.c   |  3 ++-
 gdb/rom68k-rom.c   |  4 +++-
 gdb/sh3-rom.c      |  4 +++-
 gdb/sol-thread.c   | 42 +++++++++++++++++++++++++++---------------
 gdb/sparcl-tdep.c  |  3 ++-
 gdb/sparclet-rom.c |  4 +++-
 gdb/v850ice.c      |  3 ++-
 gdb/win32-nat.c    |  3 ++-
 30 files changed, 107 insertions(+), 46 deletions(-)

diff --git a/gdb/abug-rom.c b/gdb/abug-rom.c
index cfbc834d4db..97ff0f8d322 100644
--- a/gdb/abug-rom.c
+++ b/gdb/abug-rom.c
@@ -96,7 +96,8 @@ static char *abug_inits[] = {"\r", NULL};
 
 static struct monitor_ops abug_cmds ;
 
-static void init_abug_cmds(void)
+static void 
+init_abug_cmds(void)
 {
   abug_cmds.flags =   MO_CLR_BREAK_USES_ADDR;
   abug_cmds.init =   abug_inits;			/* Init strings */
diff --git a/gdb/cpu32bug-rom.c b/gdb/cpu32bug-rom.c
index 29a1fc2b270..758c8caad9e 100644
--- a/gdb/cpu32bug-rom.c
+++ b/gdb/cpu32bug-rom.c
@@ -93,7 +93,9 @@ static struct target_ops cpu32bug_ops;
 static char *cpu32bug_inits[] = {"\r", NULL};
 
 static struct monitor_ops cpu32bug_cmds ;
-static void init_cpu32bug_cmds(void)
+
+static void 
+init_cpu32bug_cmds(void)
 {
   cpu32bug_cmds.flags =   MO_CLR_BREAK_USES_ADDR;
   cpu32bug_cmds.init =   cpu32bug_inits;		/* Init strings */
diff --git a/gdb/dbug-rom.c b/gdb/dbug-rom.c
index 93c1f8837de..fa9c97440ed 100644
--- a/gdb/dbug-rom.c
+++ b/gdb/dbug-rom.c
@@ -91,7 +91,8 @@ static struct monitor_ops dbug_cmds ;
 static char *dbug_inits[] = {"\r", NULL};
 
 
-static void init_dbug_cmds(void)
+static void 
+init_dbug_cmds(void)
 {
   dbug_cmds.flags =   MO_CLR_BREAK_USES_ADDR | MO_GETMEM_NEEDS_RANGE | MO_FILL_USES_ADDR;
   dbug_cmds.init =   dbug_inits;			/* Init strings */
diff --git a/gdb/mac-nat.c b/gdb/mac-nat.c
index 15e3f6976db..3518fe5d5ce 100644
--- a/gdb/mac-nat.c
+++ b/gdb/mac-nat.c
@@ -333,7 +333,9 @@ info_proc (args, from_tty)
 }
 
 struct target_ops child_ops ;
-static void init_child_ops(void)
+
+static void 
+init_child_ops(void)
 {
   child_ops.to_shortname =   "mac";		
   child_ops.to_longname =   "MacOS application";
diff --git a/gdb/mon960-rom.c b/gdb/mon960-rom.c
index f5adbc7d9af..37510b88fee 100644
--- a/gdb/mon960-rom.c
+++ b/gdb/mon960-rom.c
@@ -149,7 +149,9 @@ static char *mon960_inits[] = { "\r", NULL};
 #endif
 
 static struct monitor_ops mon960_cmds ;
-static void init_mon960_cmds(void)
+
+static void 
+init_mon960_cmds(void)
 {
   mon960_cmds.flags =   MO_CLR_BREAK_USES_ADDR
     | MO_NO_ECHO_ON_OPEN   | MO_SEND_BREAK_ON_STOP   | MO_GETMEM_READ_SINGLE ;    /* flags */
diff --git a/gdb/op50-rom.c b/gdb/op50-rom.c
index b12e1df5de8..32620918414 100644
--- a/gdb/op50-rom.c
+++ b/gdb/op50-rom.c
@@ -56,7 +56,9 @@ static struct target_ops op50n_ops;
 static char *op50n_inits[] = {".\r", NULL};
 
 static struct monitor_ops op50n_cmds ;
-static void init_op50n_cmds(void)
+
+static void 
+init_op50n_cmds(void)
 {
   op50n_cmds.flags =   MO_CLR_BREAK_USES_ADDR /*| MO_GETMEM_READ_SINGLE*/; /* flags */
   op50n_cmds.init =   op50n_inits;			/* Init strings */
diff --git a/gdb/ppc-bdm.c b/gdb/ppc-bdm.c
index f2f28f5c17e..e6b6adfdd71 100644
--- a/gdb/ppc-bdm.c
+++ b/gdb/ppc-bdm.c
@@ -308,7 +308,8 @@ bdm_ppc_store_registers (regno)
 
 struct target_ops bdm_ppc_ops ;
 
-static void init_bdm_ppc_ops(void)
+static void 
+init_bdm_ppc_ops(void)
 {
   bdm_ppc_ops.to_shortname =   "ocd";		
   bdm_ppc_ops.to_longname =   "Remote target with On-Chip Debugging";
diff --git a/gdb/remote-adapt.c b/gdb/remote-adapt.c
index 6da344b5865..b22f180885c 100644
--- a/gdb/remote-adapt.c
+++ b/gdb/remote-adapt.c
@@ -1364,7 +1364,9 @@ adapt_com (args, fromtty)
 /* Define the target subroutine names */
 
 struct target_ops adapt_ops ;
-static void init_adapt_ops(void)
+
+static void 
+init_adapt_ops(void)
 {
   adapt_ops.to_shortname = 	"adapt";
   adapt_ops.to_longname = 	"Remote AMD `Adapt' target";
diff --git a/gdb/remote-array.c b/gdb/remote-array.c
index 413827ab982..624871cff02 100644
--- a/gdb/remote-array.c
+++ b/gdb/remote-array.c
@@ -123,7 +123,9 @@ extern char *tmp_mips_processor_type;
 extern int mips_set_processor_type();
 
 static struct target_ops array_ops ;
-static void init_array_ops(void)
+
+static void 
+init_array_ops(void)
 {
   array_ops.to_shortname =   "array";	
   array_ops.to_longname = 		
diff --git a/gdb/remote-bug.c b/gdb/remote-bug.c
index 7a7244fd0ae..2efd710a6b5 100644
--- a/gdb/remote-bug.c
+++ b/gdb/remote-bug.c
@@ -963,7 +963,8 @@ bug_clear_breakpoints ()
 
 struct target_ops bug_ops ;
 
-static void init_bug_ops(void)
+static void 
+init_bug_ops(void)
 {
   bug_ops.to_shortname =   "bug"; "Remote BUG monitor",
 				    bug_ops.to_longname =   "Use the mvme187 board running the BUG monitor connected by a serial line.";
diff --git a/gdb/remote-eb.c b/gdb/remote-eb.c
index 09c3911370b..d3a3c4169c1 100644
--- a/gdb/remote-eb.c
+++ b/gdb/remote-eb.c
@@ -975,7 +975,9 @@ eb_mourn_inferior ()
 /* Define the target subroutine names */
 
 struct target_ops eb_ops ;
-static void init_eb_ops(void)
+
+static void 
+init_eb_ops(void)
 {
   eb_ops.to_shortname = 	"amd-eb";
   eb_ops.to_longname = 	"Remote serial AMD EBMON target";
diff --git a/gdb/remote-es.c b/gdb/remote-es.c
index 7a63e41a4bd..d26e85b7890 100644
--- a/gdb/remote-es.c
+++ b/gdb/remote-es.c
@@ -2043,7 +2043,9 @@ es1800_child_detach (args, from_tty)
 /* Define the target subroutine names  */
 
 struct target_ops es1800_ops ;
-static void init_es1800_ops(void)
+
+static void 
+init_es1800_ops(void)
 {
   es1800_ops.to_shortname =   "es1800";		
   es1800_ops.to_longname =   "Remote serial target in ES1800-emulator protocol";
@@ -2114,7 +2116,9 @@ Specify the serial device it is connected to (e.g. /dev/ttya)." ;
 /* Define the target subroutine names  */
 
 struct target_ops es1800_child_ops ;
-static void init_es1800_child_ops(void)
+
+static void 
+init_es1800_child_ops(void)
 {
   es1800_child_ops.to_shortname =   "es1800_process";	
   es1800_child_ops.to_longname =   "Remote serial target in ES1800-emulator protocol";
diff --git a/gdb/remote-est.c b/gdb/remote-est.c
index 00d23b0e675..27fd8aa5184 100644
--- a/gdb/remote-est.c
+++ b/gdb/remote-est.c
@@ -96,7 +96,9 @@ static char *est_inits[] = {"he\r", /* Resets the prompt, and clears repeated cm
 			      NULL};
 
 static struct monitor_ops est_cmds ;
-static void init_est_cmds(void)
+
+static void 
+init_est_cmds(void)
 {
   est_cmds.flags =   MO_CLR_BREAK_USES_ADDR | MO_FILL_USES_ADDR | MO_NEED_REGDUMP_AFTER_CONT |
     MO_SREC_ACK | MO_SREC_ACK_PLUS ;
diff --git a/gdb/remote-hms.c b/gdb/remote-hms.c
index 94e36f9f4ba..3ca8455d979 100644
--- a/gdb/remote-hms.c
+++ b/gdb/remote-hms.c
@@ -83,7 +83,9 @@ static char *hms_inits[] =
  NULL};
 
 static struct monitor_ops hms_cmds ;
-static void init_hms_cmds(void)
+
+static void 
+init_hms_cmds(void)
 {
   hms_cmds.flags =   MO_CLR_BREAK_USES_ADDR | MO_FILL_USES_ADDR | MO_GETMEM_NEEDS_RANGE;
   hms_cmds.init =   hms_inits;		/* Init strings */
@@ -1320,7 +1322,9 @@ hms_open (name, from_tty)
 /* Define the target subroutine names */
 
 struct target_ops hms_ops ;
-static void init_hms_ops(void)
+
+static void 
+init_hms_ops(void)
 {
   hms_ops.to_shortname =   "hms";
   hms_ops.to_longname =   "Remote HMS monitor";
diff --git a/gdb/remote-mm.c b/gdb/remote-mm.c
index 0e5828c578c..19455b4fc05 100644
--- a/gdb/remote-mm.c
+++ b/gdb/remote-mm.c
@@ -1589,7 +1589,8 @@ CORE_ADDR	*addr;
  */
 struct target_ops mm_ops ;
 
-static void init_mm_ops(void)
+static void 
+init_mm_ops(void)
 {
   mm_ops.to_shortname =   "minimon";
   mm_ops.to_longname =   "Remote AMD/Minimon target";
diff --git a/gdb/remote-nindy.c b/gdb/remote-nindy.c
index 7853ae24a7e..58e89b86859 100644
--- a/gdb/remote-nindy.c
+++ b/gdb/remote-nindy.c
@@ -767,7 +767,9 @@ nindy_before_main_loop ()
 /* Define the target subroutine names */
 
 struct target_ops nindy_ops ;
-static void init_nindy_ops(void)
+
+static void 
+init_nindy_ops(void)
 {
   nindy_ops.to_shortname =   "nindy"; "Remote serial target in i960 NINDY-specific protocol",
 					nindy_ops.to_longname =   "Use a remote i960 system running NINDY connected by a serial line.\n\
diff --git a/gdb/remote-nrom.c b/gdb/remote-nrom.c
index 1410d36496e..4999a68b8e0 100644
--- a/gdb/remote-nrom.c
+++ b/gdb/remote-nrom.c
@@ -269,7 +269,9 @@ nrom_mourn()
 /* Define the target vector. */
 
 struct target_ops nrom_ops ;
-static void init_nrom_ops(void)
+
+static void 
+init_nrom_ops(void)
 {
   nrom_ops.to_shortname =   "nrom";	
   nrom_ops.to_longname =   "Remote XDI `NetROM' target";
diff --git a/gdb/remote-os9k.c b/gdb/remote-os9k.c
index ca2f7477b24..2abfa837683 100644
--- a/gdb/remote-os9k.c
+++ b/gdb/remote-os9k.c
@@ -1146,7 +1146,8 @@ struct monitor_ops rombug_cmds = {
 
 struct target_ops rombug_ops ;
 
-static void init_rombug_ops(void)
+static void 
+init_rombug_ops(void)
 {
   rombug_ops.to_shortname =   "rombug";
   rombug_ops.to_longname =   "Microware's ROMBUG debug monitor";
diff --git a/gdb/remote-rdp.c b/gdb/remote-rdp.c
index 879a3946d45..1d596a42c1f 100644
--- a/gdb/remote-rdp.c
+++ b/gdb/remote-rdp.c
@@ -1436,7 +1436,8 @@ remote_rdp_attach(args, from_tty)
 
 struct target_ops remote_rdp_ops ;
 
-static void init_remote_rdp_ops(void)
+static void 
+init_remote_rdp_ops(void)
 {
   remote_rdp_ops.to_shortname =   "rdp";
   remote_rdp_ops.to_longname =   "Remote Target using the RDProtocol";
diff --git a/gdb/remote-sds.c b/gdb/remote-sds.c
index c8fe721e7b1..33e2bb522a2 100644
--- a/gdb/remote-sds.c
+++ b/gdb/remote-sds.c
@@ -1124,7 +1124,8 @@ sds_remove_breakpoint (addr, contents_cache)
 
 static struct target_ops sds_ops ;
 
-static void init_sds_ops(void)
+static void 
+init_sds_ops(void)
 {
   sds_ops.to_shortname =   "sds";
   sds_ops.to_longname =   "Remote serial target with SDS protocol";
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 132b1b36f7a..e10fcedd6b7 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -919,7 +919,9 @@ simulator_command (args, from_tty)
 /* Define the target subroutine names */
 
 struct target_ops gdbsim_ops ;
-static void init_gdbsim_ops(void)
+
+static void 
+init_gdbsim_ops(void)
 {
   gdbsim_ops.to_shortname =   "sim";		
   gdbsim_ops.to_longname =   "simulator";		
diff --git a/gdb/remote-st.c b/gdb/remote-st.c
index 7255146cb3a..1efdbfac027 100644
--- a/gdb/remote-st.c
+++ b/gdb/remote-st.c
@@ -795,7 +795,8 @@ connect_command (args, fromtty)
 
 struct target_ops st2000_ops ;
 
-static void init_st2000_ops(void)
+static void 
+init_st2000_ops(void)
 {
   st2000_ops.to_shortname =   "st2000";
   st2000_ops.to_longname =   "Remote serial Tandem ST2000 target";
diff --git a/gdb/remote-udi.c b/gdb/remote-udi.c
index 6fd277e0fcc..6397bca5d16 100644
--- a/gdb/remote-udi.c
+++ b/gdb/remote-udi.c
@@ -1623,7 +1623,8 @@ service_HIF(msg)
 
 struct target_ops udi_ops;
 
-static void init_udi_ops(void)
+static void 
+init_udi_ops(void)
 {
   udi_ops.to_shortname =         "udi";
   udi_ops.to_longname = 	"Remote UDI connected TIP";
diff --git a/gdb/rom68k-rom.c b/gdb/rom68k-rom.c
index 6347e39df66..831d299652a 100644
--- a/gdb/rom68k-rom.c
+++ b/gdb/rom68k-rom.c
@@ -94,7 +94,9 @@ static struct target_ops rom68k_ops;
 static char *rom68k_inits[] = {".\r\r", NULL}; /* Exits pm/pr & download cmds */
 
 static struct monitor_ops rom68k_cmds ;
-static void init_rom68k_cmds(void)
+
+static void 
+init_rom68k_cmds(void)
 {
   rom68k_cmds.flags =   0;
   rom68k_cmds.init =   rom68k_inits; /* monitor init string */
diff --git a/gdb/sh3-rom.c b/gdb/sh3-rom.c
index 77eb093cf3e..ab4aa692427 100644
--- a/gdb/sh3-rom.c
+++ b/gdb/sh3-rom.c
@@ -184,7 +184,9 @@ static struct target_ops sh3_ops, sh3e_ops;
 static char *sh3_inits[] = {"\003", NULL}; /* Exits sub-command mode & download cmds */
 
 static struct monitor_ops sh3_cmds ;
-static void init_sh3_cmds(void)
+
+static void 
+init_sh3_cmds(void)
 {
   sh3_cmds.flags =   MO_CLR_BREAK_USES_ADDR | MO_GETMEM_READ_SINGLE ;	/* flags */
   sh3_cmds.init =   sh3_inits;		/* monitor init string */
diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index e0568c21277..3fe6268bf31 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -64,6 +64,9 @@ extern struct target_ops sol_core_ops; /* Forward declaration */
 /* place to store core_ops before we overwrite it */
 static struct target_ops orig_core_ops;
 
+struct target_ops sol_thread_ops;
+struct target_ops sol_core_ops;
+
 extern int procfs_suppress_run;
 extern struct target_ops procfs_ops; /* target vector for procfs.c */
 extern struct target_ops core_ops; /* target vector for corelow.c */
@@ -113,6 +116,9 @@ static int lwp_to_thread PARAMS ((int lwp));
 static int sol_thread_alive PARAMS ((int pid));
 static void sol_core_close PARAMS ((int quitting));
 
+static void init_sol_thread_ops PARAMS ((void));
+static void init_sol_core_ops PARAMS ((void));
+
 #define THREAD_FLAG 0x80000000
 #define is_thread(ARG) (((ARG) & THREAD_FLAG) != 0)
 #define is_lwp(ARG) (((ARG) & THREAD_FLAG) == 0)
@@ -1506,21 +1512,9 @@ ignore (addr, contents)
 }
 
 
-struct target_ops sol_thread_ops;
-struct target_ops sol_core_ops;
-
-/* we suppress the call to add_target of core_ops in corelow because
-   if there are two targets in the stratum core_stratum, find_core_target
-   won't know which one to return.  see corelow.c for an additonal
-   comment on coreops_suppress_target. */
-int coreops_suppress_target = 1;
-
-void
-_initialize_sol_thread ()
+static void
+init_sol_thread_ops ()
 {
-  void *dlhandle;
-
-  /* Initialize sol_thread_ops */
   sol_thread_ops.to_shortname = "solaris-threads";
   sol_thread_ops.to_longname = "Solaris threads and pthread.";
   sol_thread_ops.to_doc = "Solaris threads and pthread support.";
@@ -1561,8 +1555,12 @@ _initialize_sol_thread ()
   sol_thread_ops.to_sections = 0;
   sol_thread_ops.to_sections_end = 0;
   sol_thread_ops.to_magic = OPS_MAGIC;
+}
+
 
-  /* Initialize sol_core_ops */
+static void
+init_sol_core_ops ()
+{
   sol_core_ops.to_shortname  = "solaris-core";
   sol_core_ops.to_longname  = "Solaris core threads and pthread.";
   sol_core_ops.to_doc  = "Solaris threads and pthread support for core files.";
@@ -1598,7 +1596,21 @@ _initialize_sol_thread ()
   sol_core_ops.to_sections  = 0;
   sol_core_ops.to_sections_end  = 0;
   sol_core_ops.to_magic  = OPS_MAGIC;
+}
+
+/* we suppress the call to add_target of core_ops in corelow because
+   if there are two targets in the stratum core_stratum, find_core_target
+   won't know which one to return.  see corelow.c for an additonal
+   comment on coreops_suppress_target. */
+int coreops_suppress_target = 1;
+
+void
+_initialize_sol_thread ()
+{
+  void *dlhandle;
 
+  init_sol_thread_ops ();
+  init_sol_core_ops ();
 
   dlhandle = dlopen ("libthread_db.so.1", RTLD_NOW);
   if (!dlhandle)
diff --git a/gdb/sparcl-tdep.c b/gdb/sparcl-tdep.c
index 46cee7ff788..7e8082fca28 100644
--- a/gdb/sparcl-tdep.c
+++ b/gdb/sparcl-tdep.c
@@ -893,7 +893,8 @@ sparclite_download (filename, from_tty)
 
 static struct target_ops sparclite_ops ;
 
-static void init_sparclite_ops(void)
+static void 
+init_sparclite_ops(void)
 {
   sparclite_ops.to_shortname =   "sparclite";		
   sparclite_ops.to_longname =   "SPARClite remote target";
diff --git a/gdb/sparclet-rom.c b/gdb/sparclet-rom.c
index 24484cd8050..992cca1ab51 100644
--- a/gdb/sparclet-rom.c
+++ b/gdb/sparclet-rom.c
@@ -195,7 +195,9 @@ sparclet_load (desc, file, hashmark)
 static char *sparclet_inits[] = {"\n\r\r\n", NULL};
 
 static struct monitor_ops sparclet_cmds ;
-static void init_sparclet_cmds(void)
+
+static void 
+init_sparclet_cmds(void)
 {
   sparclet_cmds.flags =   MO_CLR_BREAK_USES_ADDR |
     MO_HEX_PREFIX          |
diff --git a/gdb/v850ice.c b/gdb/v850ice.c
index 0135e58169e..36784c082fe 100755
--- a/gdb/v850ice.c
+++ b/gdb/v850ice.c
@@ -914,7 +914,8 @@ view_source (addr)
 
 /* Define the target subroutine names */
 
-static void init_850ice_ops(void)
+static void 
+init_850ice_ops(void)
 {
   v850ice_ops.to_shortname   =   "ice";		
   v850ice_ops.to_longname    =   "NEC V850 ICE interface";
diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index 47dbc55e7da..87e96bd23ac 100644
--- a/gdb/win32-nat.c
+++ b/gdb/win32-nat.c
@@ -1003,7 +1003,8 @@ child_close ()
 
 struct target_ops child_ops ;
 
-static void init_child_ops(void)
+static void 
+init_child_ops(void)
 {
   child_ops.to_shortname =   "child";
   child_ops.to_longname =   "Win32 child process";
-- 
2.30.2