 @@ -358,81 +358,38 @@ nbsd_enable_proc_events (pid_t pid)
 #endif
 #endif
+}
 /* Add threads for any new LWPs in a process.
    When LWP events are used, this function is only used to detect existing
    threads when attaching to a process.  On older systems, this function is
    called to discover new threads each time the thread list is updated.  */
 static void
 nbsd_add_threads (pid_t pid)
+{
 #ifdef PT_GETNUMLWPS
   struct cleanup *cleanup;
   lwpid_t *lwps;
   int i, nlwps;
   gdb_assert (!in_thread_list (pid_to_ptid (pid)));
   nlwps = ptrace (PT_GETNUMLWPS, pid, NULL, 0);
   if (nlwps == -1)
     perror_with_name (("ptrace"));
   lwps = XCNEWVEC (lwpid_t, nlwps);
   cleanup = make_cleanup (xfree, lwps);
   nlwps = ptrace (PT_GETLWPLIST, pid, (caddr_t) lwps, nlwps);
   if (nlwps == -1)
     perror_with_name (("ptrace"));
   for (i = 0; i < nlwps; i++)
       ptid_t ptid = ptid_build (pid, lwps[i], 0);
       if (!in_thread_list (ptid))
 #ifdef PT_LWP_EVENTS
 	  struct ptrace_lwpinfo pl;
 	  /* Don't add exited threads.  Note that this is only called
 	     when attaching to a multi-threaded process.  */
 	  if (ptrace (PT_LWPINFO, lwps[i], (caddr_t) &pl, sizeof pl) == -1)
 	    perror_with_name (("ptrace"));
 	  if (pl.pl_flags & PL_FLAG_EXITED)
 	    continue;
 #endif
 	  if (debug_nbsd_lwp)
 	    fprintf_unfiltered (gdb_stdlog,
 				"FLWP: adding thread for LWP %u\n",
 				lwps[i]);
 	  add_thread (ptid);
   do_cleanups (cleanup);
 #else
   int val;
   struct ptrace_lwpinfo pl;
   gdb_assert (!in_thread_list (pid_to_ptid (pid)));
   pl.pl_lwpid = 0;
   while ((val = ptrace (PT_LWPINFO, pid, (void *)&pl, sizeof(pl))) != -1
     && pl.pl_lwpid != 0)
+    {
       ptid_t ptid = ptid_build (pid, pl.pl_lwpid, 0);
       if (!in_thread_list (ptid))
 	add_thread (ptid);
+    }
 #endif
+}
 /* Implement the "to_update_thread_list" target_ops method.  */
 static void
 nbsd_update_thread_list (struct target_ops *ops)
+{
 #ifdef PT_LWP_EVENTS
   /* With support for thread events, threads are added/deleted from the
      list as events are reported, so just try deleting exited threads.  */
   delete_exited_threads ();
 #else
   prune_threads ();
 @@ -584,27 +541,27 @@ nbsd_resume (struct target_ops *ops,
   pid_t pid;
   /* Don't PT_CONTINUE a process which has a pending vfork done event.  */
   if (ptid_equal (minus_one_ptid, ptid))
     pid = ptid_get_pid (inferior_ptid);
   else
     pid = ptid_get_pid (ptid);
   if (nbsd_is_vfork_done_pending (pid))
     return;
 #endif
   if (debug_nbsd_lwp)
     fprintf_unfiltered (gdb_stdlog,
-			"FLWP: nbsd_resume for ptid (%d, %ld, %ld)\n",
+			"NLWP: nbsd_resume for ptid (%d, %ld, %ld)\n",
 			ptid_get_pid (ptid), ptid_get_lwp (ptid),
 			ptid_get_tid (ptid));
   if (ptid_lwp_p (ptid))
+    {
       /* If ptid is a specific LWP, suspend all other LWPs in the process.  */
       struct thread_info *tp;
       int request;
       ALL_NON_EXITED_THREADS (tp)
+        {
 	  if (ptid_get_pid (tp->ptid) != ptid_get_pid (ptid))
 	    continue;
 @@ -674,66 +631,66 @@ nbsd_wait (struct target_ops *ops,
 	  wptid = ptid_build (pid, pl.pl_lwpid, 0);
 #ifdef PT_LWP_EVENTS
 	  if (pl.pl_flags & PL_FLAG_EXITED)
+	    {
 	      /* If GDB attaches to a multi-threaded process, exiting
 		 threads might be skipped during nbsd_post_attach that
 		 have not yet reported their PL_FLAG_EXITED event.
 		 Ignore EXITED events for an unknown LWP.  */
 	      if (in_thread_list (wptid))
+		{
 		  if (debug_nbsd_lwp)
 		    fprintf_unfiltered (gdb_stdlog,
-					"FLWP: deleting thread for LWP %u\n",
+					"NLWP: deleting thread for LWP %u\n",
 					pl.pl_lwpid);
 		  if (print_thread_events)
 		    printf_unfiltered (_("[%s exited]\n"), target_pid_to_str
 				       (wptid));
 		  delete_thread (wptid);
+		}
 	      if (ptrace (PT_CONTINUE, pid, (caddr_t) 1, 0) == -1)
 		perror_with_name (("ptrace"));
 	      continue;
+	    }
 #endif
 	  /* Switch to an LWP PTID on the first stop in a new process.
 	     This is done after handling PL_FLAG_EXITED to avoid
 	     switching to an exited LWP.  It is done before checking
 	     PL_FLAG_BORN in case the first stop reported after
 	     attaching to an existing process is a PL_FLAG_BORN
 	     event.  */
 	  if (in_thread_list (pid_to_ptid (pid)))
+	    {
 	      if (debug_nbsd_lwp)
 		fprintf_unfiltered (gdb_stdlog,
-				    "FLWP: using LWP %u for first thread\n",
+				    "NLWP: using LWP %u for first thread\n",
 				    pl.pl_lwpid);
 	      thread_change_ptid (pid_to_ptid (pid), wptid);
+	    }
 #ifdef PT_LWP_EVENTS
 	  if (pl.pl_flags & PL_FLAG_BORN)
+	    {
 	      /* If GDB attaches to a multi-threaded process, newborn
 		 threads might be added by nbsd_add_threads that have
 		 not yet reported their PL_FLAG_BORN event.  Ignore
 		 BORN events for an already-known LWP.  */
 	      if (!in_thread_list (wptid))
+		{
 		  if (debug_nbsd_lwp)
 		    fprintf_unfiltered (gdb_stdlog,
-					"FLWP: adding thread for LWP %u\n",
+					"NLWP: adding thread for LWP %u\n",
 					pl.pl_lwpid);
 		  add_thread (wptid);
+		}
 	      ourstatus->kind = TARGET_WAITKIND_SPURIOUS;
 	      return wptid;
+	    }
 #endif
 #ifdef TDP_RFPPWAIT
 	  if (pl.pl_flags & PL_FLAG_FORKED)
+	    {
 #ifndef PTRACE_VFORK
 	      struct kinfo_proc kp;
 @@ -1013,21 +970,21 @@ nbsd_nat_add_target (struct target_ops *
 #endif
   add_target (t);
+}
 /* Provide a prototype to silence -Wmissing-prototypes.  */
 extern initialize_file_ftype _initialize_nbsd_nat;
 void
 _initialize_nbsd_nat (void)
+{
 #ifdef PT_LWPINFO
   add_setshow_boolean_cmd ("nbsd-lwp", class_maintenance,
 			   &debug_nbsd_lwp, _("\
-Set debugging of FreeBSD lwp module."), _("\
+Set debugging of NetBSD lwp module."), _("\
-Show debugging of FreeBSD lwp module."), _("\
+Show debugging of NetBSD lwp module."), _("\
 Enables printf debugging output."),
 			   NULL,
 			   &show_nbsd_lwp_debug,
 			   &setdebuglist, &showdebuglist);
 #endif
+}