* thread.c: cull duplicate prototypes. Move prototypes to top.

        * serial.c: indentation cleanup.
        * breakpoint.c: add casts to eliminate compiler warnings.

3 files changed, 50 insertions, 70 deletions

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 063cab8..b979bf2 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -665,7 +665,8 @@ insert_breakpoints ()
               /* Bp set, now make sure callbacks are enabled */ 
               args.kind = b->type == bp_catch_catch ? EX_EVENT_CATCH : EX_EVENT_THROW;
               args.enable = 1;
-              sal = catch_errors ((int (*) PARAMS ((char *))) cover_target_enable_exception_callback,
+              sal = catch_errors ((int (*) PARAMS ((char *))) 
+				  cover_target_enable_exception_callback,
                                   (char *) &args,
                                   message, RETURN_MASK_ALL);
               if (sal && (sal != (struct symtab_and_line *) -1))
@@ -914,7 +915,7 @@ update_breakpoints_after_exec ()
           (b->type == bp_catch_vfork) ||
           (b->type == bp_catch_fork))
         {
-          b->address = NULL;
+          b->address = (CORE_ADDR) NULL;
           continue;
         }
 
@@ -959,7 +960,7 @@ update_breakpoints_after_exec ()
       /* If this breakpoint has survived the above battery of checks, then
          it must have a symbolic address.  Be sure that it gets reevaluated
          to a target address, rather than reusing the old evaluation.  */
-      b->address = NULL;
+      b->address = (CORE_ADDR) NULL;
     }
 }
 
diff --git a/gdb/serial.c b/gdb/serial.c
index 07638ed..7e182cf 100644
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -508,17 +508,19 @@ _initialize_serial ()
 Use <CR>~. or <CR>~^D to break out.");
 #endif /* 0 */
 
-  add_show_from_set (add_set_cmd ("remotelogfile", no_class,
-				  var_filename, (char *)&serial_logfile,
-				  "Set filename for remote session recording.\n\
+  add_show_from_set 
+    (add_set_cmd ("remotelogfile", no_class,
+		  var_filename, (char *) &serial_logfile,
+		  "Set filename for remote session recording.\n\
 This file is used to record the remote session for future playback\n\
-by gdbserver.", &setlist),
-		     &showlist);
-
-  add_show_from_set (add_set_enum_cmd ("remotelogbase", no_class,
-				       logbase_enums,
-				       (char *)&serial_logbase,
-				       "Set numerical base for remote session logging",
-				       &setlist),
-			   &showlist);
+by gdbserver.", 
+		  &setlist),
+     &showlist);
+
+  add_show_from_set 
+    (add_set_enum_cmd ("remotelogbase", no_class,
+		       logbase_enums, (char *) &serial_logbase,
+		       "Set numerical base for remote session logging",
+		       &setlist),
+     &showlist);
 }
diff --git a/gdb/thread.c b/gdb/thread.c
index bf4631c..6a7ab09 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -73,6 +73,35 @@ struct thread_info
 
 };
 
+/* Prototypes for exported functions. */
+
+void _initialize_thread PARAMS ((void));
+
+/* Prototypes for local functions. */
+
+#if !defined(FIND_NEW_THREADS)
+#define FIND_NEW_THREADS target_find_new_threads
+#endif  
+			   
+static struct thread_info *thread_list = NULL;
+static int highest_thread_num;
+
+static struct thread_info * find_thread_id PARAMS ((int num));
+
+static void thread_command PARAMS ((char * tidstr, int from_tty));
+static void thread_apply_all_command PARAMS ((char *, int));
+static int  thread_alive PARAMS ((struct thread_info *));
+static void info_threads_command PARAMS ((char *, int));
+static void thread_apply_command PARAMS ((char *, int));
+static void restore_current_thread PARAMS ((int));
+static void switch_to_thread PARAMS ((int pid));
+static void prune_threads PARAMS ((void));
+
+/* If the host has threads, the host machine definition may set this
+   macro. But, for remote thread debugging, it gets more complex and
+   setting macros does not bind to the various target dependent
+   methods well. So, we use the vector target_thread_functions */
+
 static struct target_thread_vector *target_thread_functions;
 
 int
@@ -87,10 +116,9 @@ target_find_new_threads ()
 
 
 int
-target_get_thread_info PARAMS ((
-				 gdb_threadref * ref,
-				 int selection,		/* FIXME: Selection */
-				 struct gdb_ext_thread_info * info));
+target_get_thread_info PARAMS ((gdb_threadref * ref,
+				int selection,		/* FIXME: Selection */
+				struct gdb_ext_thread_info * info));
 
 int
 target_get_thread_info (ref, selection, info)
@@ -121,8 +149,6 @@ bind_target_thread_vector (vec)
   target_thread_functions = vec;
 }
 
-/* Prototypes for exported functions. */
-
 struct target_thread_vector *
 unbind_target_thread_vector ()
 {
@@ -132,55 +158,6 @@ unbind_target_thread_vector ()
   return retval;
 }				/* unbind_target_thread-vector */
 
-void _initialize_thread PARAMS ((void));
-
-
-/* Prototypes for local functions. */
-/* If the host has threads, the host machine definition may
-   set this macro. But, for remote thread debugging, it gets more
-   complex and setting macros does not bind to the various target
-   dependent methods well. So, we use the vector target_thread_functions
-   */
-#if !defined(FIND_NEW_THREADS)
-#define FIND_NEW_THREADS target_find_new_threads
-#endif  
-			   
-static struct thread_info *thread_list = NULL;
-static int highest_thread_num;
-
-static void
-thread_command PARAMS ((char * tidstr, int from_tty));
-static void
-prune_threads PARAMS ((void));
-
-static void
-switch_to_thread PARAMS ((int pid));
-
-static struct thread_info *
-find_thread_id PARAMS ((int num));
-
-static void
-info_threads_command PARAMS ((char *, int));
-
-static void
-restore_current_thread PARAMS ((int));
-
-static void
-thread_apply_all_command PARAMS ((char *, int));
-
-static void
-thread_apply_command PARAMS ((char *, int));
-
-static void info_threads_command PARAMS ((char *, int));
-
-static void restore_current_thread PARAMS ((int));
-
-static void thread_apply_all_command PARAMS ((char *, int));
-
-static void thread_apply_command PARAMS ((char *, int));
-
-static int thread_alive PARAMS ((struct thread_info *));
-
 void
 init_thread_list ()
 {