* arm-tdep.c: Include "observer.h".

[deliverable/binutils-gdb.git] / gdb / main.c

diff --git a/gdb/main.c b/gdb/main.c
index a1f5981d991d0548b022d92e8980e6ba8bd5abaf..6be4805b5677d7289c84aedb373e577238228efc 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -186,7 +186,7 @@ get_init_files (char **system_gdbinit,
 
       /* If the .gdbinit file in the current directory is the same as
         the $HOME/.gdbinit file, it should not be sourced.  homebuf
-        and cwdbuf are used in that purpose. Make sure that the stats
+        and cwdbuf are used in that purpose.  Make sure that the stats
         are zero in case one of them fails (this guarantees that they
         won't match if either exists).  */
 
@@ -235,7 +235,7 @@ captured_command_loop (void *data)
      check to detect bad FUNCs code.  */
   do_cleanups (ALL_CLEANUPS);
   /* If the command_loop returned, normally (rather than threw an
-     error) we try to quit. If the quit is aborted, catch_errors()
+     error) we try to quit.  If the quit is aborted, catch_errors()
      which called this catch the signal and restart the command
      loop.  */
   quit_command (NULL, instream == stdin);
@@ -335,7 +335,8 @@ captured_main (void *data)
     /* Don't use *_filtered or warning() (which relies on
        current_target) until after initialize_all_files().  */
     fprintf_unfiltered (gdb_stderr,
-                        _("%s: warning: error finding working directory: %s\n"),
+                       _("%s: warning: error finding "
+                         "working directory: %s\n"),
                         argv[0], safe_strerror (errno));
     
   current_directory = gdb_dirbuf;
@@ -514,7 +515,8 @@ captured_main (void *data)
            break;
          case 'f':
            annotation_level = 1;
-/* We have probably been invoked from emacs.  Disable window interface.  */
+           /* We have probably been invoked from emacs.  Disable
+              window interface.  */
            use_windows = 0;
            break;
          case 's':
@@ -564,8 +566,9 @@ captured_main (void *data)
 
              if (!gdbtk_test (optarg))
                {
-                 fprintf_unfiltered (gdb_stderr, 
-                                     _("%s: unable to load tclcommand file \"%s\""),
+                 fprintf_unfiltered (gdb_stderr,
+                                     _("%s: unable to load "
+                                       "tclcommand file \"%s\""),
                                      argv[0], optarg);
                  exit (1);
                }
@@ -628,9 +631,9 @@ captured_main (void *data)
                /* Don't use *_filtered or warning() (which relies on
                   current_target) until after initialize_all_files().  */
 
-               fprintf_unfiltered
-                 (gdb_stderr,
-                _("warning: could not set timeout limit to `%s'.\n"), optarg);
+               fprintf_unfiltered (gdb_stderr,
+                                   _("warning: could not set "
+                                     "timeout limit to `%s'.\n"), optarg);
              else
                remote_timeout = i;
            }
@@ -638,7 +641,8 @@ captured_main (void *data)
 
          case '?':
            fprintf_unfiltered (gdb_stderr,
-                       _("Use `%s --help' for a complete list of options.\n"),
+                               _("Use `%s --help' for a "
+                                 "complete list of options.\n"),
                                argv[0]);
            exit (1);
          }
@@ -668,7 +672,8 @@ captured_main (void *data)
       if (optind >= argc)
        {
          fprintf_unfiltered (gdb_stderr,
-                             _("%s: `--args' specified but no program specified\n"),
+                             _("%s: `--args' specified but "
+                               "no program specified\n"),
                              argv[0]);
          exit (1);
        }
@@ -703,13 +708,14 @@ captured_main (void *data)
       /* Any argument left on the command line is unexpected and
         will be ignored.  Inform the user.  */
       if (optind < argc)
-       fprintf_unfiltered (gdb_stderr, _("\
-Excess command line arguments ignored. (%s%s)\n"),
+       fprintf_unfiltered (gdb_stderr,
+                           _("Excess command line "
+                             "arguments ignored. (%s%s)\n"),
                            argv[optind],
                            (optind == argc - 1) ? "" : " ...");
     }
 
-  /* Lookup gdbinit files. Note that the gdbinit file name may be
+  /* Lookup gdbinit files.  Note that the gdbinit file name may be
      overriden during file initialization, so get_init_files should be
      called after gdb_init.  */
   get_init_files (&system_gdbinit, &home_gdbinit, &local_gdbinit);
@@ -830,20 +836,24 @@ Excess command line arguments ignored. (%s%s)\n"),
       /* The exec file and the symbol-file are the same.  If we can't
          open it, better only print one error message.
          catch_command_errors returns non-zero on success!  */
-      if (catch_command_errors (exec_file_attach, execarg, !batch_flag, RETURN_MASK_ALL))
-       catch_command_errors (symbol_file_add_main, symarg, !batch_flag, RETURN_MASK_ALL);
+      if (catch_command_errors (exec_file_attach, execarg,
+                               !batch_flag, RETURN_MASK_ALL))
+       catch_command_errors (symbol_file_add_main, symarg,
+                             !batch_flag, RETURN_MASK_ALL);
     }
   else
     {
       if (execarg != NULL)
-       catch_command_errors (exec_file_attach, execarg, !batch_flag, RETURN_MASK_ALL);
+       catch_command_errors (exec_file_attach, execarg,
+                             !batch_flag, RETURN_MASK_ALL);
       if (symarg != NULL)
-       catch_command_errors (symbol_file_add_main, symarg, !batch_flag, RETURN_MASK_ALL);
+       catch_command_errors (symbol_file_add_main, symarg,
+                             !batch_flag, RETURN_MASK_ALL);
     }
 
   if (corearg && pidarg)
-    error (_("\
-Can't attach to process and specify a core file at the same time."));
+    error (_("Can't attach to process and specify "
+            "a core file at the same time."));
 
   if (corearg != NULL)
     catch_command_errors (core_file_command, corearg,