catch_command_errors: Remove 'mask' parameter

All callers of catch_command_errors pass RETURN_MASK_ALL as mask
argument.  This patch eliminates the mask parameter as unnecessary.

gdb/ChangeLog:
2015-02-27  Pedro Alves  <palves@redhat.com>

	* main.c (catch_command_errors, catch_command_errors_const):
	Remove 'mask' argument.  Adjust.
	(captured_main): Adjust callers.

gdb/testsuite/ChangeLog:
2015-02-27  Pedro Alves  <palves@redhat.com>

	* gdb.gdb/python-interrupts.exp (test_python_interrupts): Adjust
	call to catch_command_errors.
	* gdb.gdb/python-selftest.exp (selftest_python): Adjust call to
	catch_command_errors.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1b1bd1fe130cecc90d3518ae327c294d14d6b7b3..39ae8a4b3fc3a3e8935a43f259cae2664572e7f1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-27  Pedro Alves  <palves@redhat.com>
+
+       * main.c (catch_command_errors, catch_command_errors_const):
+       Remove 'mask' argument.  Adjust.
+       (captured_main): Adjust callers.
+
 2015-02-27  Pedro Alves  <palves@redhat.com>
 
        * python/python-internal.h: Include "extension-priv.h".

diff --git a/gdb/main.c b/gdb/main.c
index 0833c815480e6a1f380a3c3aa8004857a2b32794..7237d2df17a36fa8b242a2b73f83a9802cadebf4 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -362,11 +362,11 @@ typedef void (catch_command_errors_ftype) (char *, int);
 
 static int
 catch_command_errors (catch_command_errors_ftype *command,
-                     char *arg, int from_tty, return_mask mask)
+                     char *arg, int from_tty)
 {
   volatile struct gdb_exception e;
 
-  TRY_CATCH (e, mask)
+  TRY_CATCH (e, RETURN_MASK_ALL)
     {
       int was_sync = sync_execution;
 
@@ -385,11 +385,11 @@ typedef void (catch_command_errors_const_ftype) (const char *, int);
 
 static int
 catch_command_errors_const (catch_command_errors_const_ftype *command,
-                           const char *arg, int from_tty, return_mask mask)
+                           const char *arg, int from_tty)
 {
   volatile struct gdb_exception e;
 
-  TRY_CATCH (e, mask)
+  TRY_CATCH (e, RETURN_MASK_ALL)
     {
       int was_sync = sync_execution;
 
@@ -992,8 +992,7 @@ captured_main (void *data)
      processed; it sets global parameters, which are independent of
      what file you are debugging or what directory you are in.  */
   if (system_gdbinit && !inhibit_gdbinit)
-    catch_command_errors_const (source_script, system_gdbinit,
-                               0, RETURN_MASK_ALL);
+    catch_command_errors_const (source_script, system_gdbinit, 0);
 
   /* Read and execute $HOME/.gdbinit file, if it exists.  This is done
      *before* all the command line arguments are processed; it sets
@@ -1001,8 +1000,7 @@ captured_main (void *data)
      debugging or what directory you are in.  */
 
   if (home_gdbinit && !inhibit_gdbinit && !inhibit_home_gdbinit)
-    catch_command_errors_const (source_script,
-                               home_gdbinit, 0, RETURN_MASK_ALL);
+    catch_command_errors_const (source_script, home_gdbinit, 0);
 
   /* Process '-ix' and '-iex' options early.  */
   for (i = 0; VEC_iterate (cmdarg_s, cmdarg_vec, i, cmdarg_p); i++)
@@ -1010,22 +1008,22 @@ captured_main (void *data)
     {
       case CMDARG_INIT_FILE:
         catch_command_errors_const (source_script, cmdarg_p->string,
-                                   !batch_flag, RETURN_MASK_ALL);
+                                   !batch_flag);
        break;
       case CMDARG_INIT_COMMAND:
         catch_command_errors (execute_command, cmdarg_p->string,
-                             !batch_flag, RETURN_MASK_ALL);
+                             !batch_flag);
        break;
     }
 
   /* Now perform all the actions indicated by the arguments.  */
   if (cdarg != NULL)
     {
-      catch_command_errors (cd_command, cdarg, 0, RETURN_MASK_ALL);
+      catch_command_errors (cd_command, cdarg, 0);
     }
 
   for (i = 0; i < ndir; i++)
-    catch_command_errors (directory_switch, dirarg[i], 0, RETURN_MASK_ALL);
+    catch_command_errors (directory_switch, dirarg[i], 0);
   xfree (dirarg);
 
   /* Skip auto-loading section-specified scripts until we've sourced
@@ -1042,18 +1040,18 @@ captured_main (void *data)
          open it, better only print one error message.
          catch_command_errors returns non-zero on success!  */
       if (catch_command_errors_const (exec_file_attach, execarg,
-                                     !batch_flag, RETURN_MASK_ALL))
+                                     !batch_flag))
        catch_command_errors_const (symbol_file_add_main, symarg,
-                                   !batch_flag, RETURN_MASK_ALL);
+                                   !batch_flag);
     }
   else
     {
       if (execarg != NULL)
        catch_command_errors_const (exec_file_attach, execarg,
-                                   !batch_flag, RETURN_MASK_ALL);
+                                   !batch_flag);
       if (symarg != NULL)
        catch_command_errors_const (symbol_file_add_main, symarg,
-                                   !batch_flag, RETURN_MASK_ALL);
+                                   !batch_flag);
     }
 
   if (corearg && pidarg)
@@ -1061,11 +1059,9 @@ captured_main (void *data)
             "a core file at the same time."));
 
   if (corearg != NULL)
-    catch_command_errors (core_file_command, corearg,
-                         !batch_flag, RETURN_MASK_ALL);
+    catch_command_errors (core_file_command, corearg, !batch_flag);
   else if (pidarg != NULL)
-    catch_command_errors (attach_command, pidarg,
-                         !batch_flag, RETURN_MASK_ALL);
+    catch_command_errors (attach_command, pidarg, !batch_flag);
   else if (pid_or_core_arg)
     {
       /* The user specified 'gdb program pid' or gdb program core'.
@@ -1075,13 +1071,13 @@ captured_main (void *data)
       if (isdigit (pid_or_core_arg[0]))
        {
          if (catch_command_errors (attach_command, pid_or_core_arg,
-                                   !batch_flag, RETURN_MASK_ALL) == 0)
+                                   !batch_flag) == 0)
            catch_command_errors (core_file_command, pid_or_core_arg,
-                                 !batch_flag, RETURN_MASK_ALL);
+                                 !batch_flag);
        }
       else /* Can't be a pid, better be a corefile.  */
        catch_command_errors (core_file_command, pid_or_core_arg,
-                             !batch_flag, RETURN_MASK_ALL);
+                             !batch_flag);
     }
 
   if (ttyarg != NULL)
@@ -1104,8 +1100,7 @@ captured_main (void *data)
        {
          auto_load_local_gdbinit_loaded = 1;
 
-         catch_command_errors_const (source_script, local_gdbinit, 0,
-                                     RETURN_MASK_ALL);
+         catch_command_errors_const (source_script, local_gdbinit, 0);
        }
     }
 
@@ -1123,11 +1118,11 @@ captured_main (void *data)
     {
       case CMDARG_FILE:
         catch_command_errors_const (source_script, cmdarg_p->string,
-                                   !batch_flag, RETURN_MASK_ALL);
+                                   !batch_flag);
        break;
       case CMDARG_COMMAND:
         catch_command_errors (execute_command, cmdarg_p->string,
-                             !batch_flag, RETURN_MASK_ALL);
+                             !batch_flag);
        break;
     }
 

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 60dbaa88a1458b1156b4ddb4bba854bef81a00fe..82ee0f8e689ebfe21a7787eb2e3d38aacc59af80 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-27  Pedro Alves  <palves@redhat.com>
+
+       * gdb.gdb/python-interrupts.exp (test_python_interrupts): Adjust
+       call to catch_command_errors.
+       * gdb.gdb/python-selftest.exp (selftest_python): Adjust call to
+       catch_command_errors.
+
 2015-02-27  Pedro Alves  <palves@redhat.com>
 
        * gdb.gdb/complaints.exp (test_initial_complaints): Also accept

diff --git a/gdb/testsuite/gdb.gdb/python-interrupts.exp b/gdb/testsuite/gdb.gdb/python-interrupts.exp
index e2c510a370ec218f44dad6171d116a903b90ac60..34b3c3631eba2f4d7d4a7a6d8644ae7a8267bfd7 100644 (file)
--- a/gdb/testsuite/gdb.gdb/python-interrupts.exp
+++ b/gdb/testsuite/gdb.gdb/python-interrupts.exp
@@ -25,7 +25,7 @@ proc test_python_interrupts {} {
     }
 
     gdb_breakpoint set_active_ext_lang temporary
-    gdb_test "call catch_command_errors(execute_command, \"python print(5)\", 0, RETURN_MASK_ALL)" \
+    gdb_test "call catch_command_errors(execute_command, \"python print(5)\", 0)" \
        "Temporary breakpoint.*silently stop."
     gdb_test "signal SIGINT" \
        "KeyboardInterrupt.*Error while executing Python code."

diff --git a/gdb/testsuite/gdb.gdb/python-selftest.exp b/gdb/testsuite/gdb.gdb/python-selftest.exp
index 7cb3dd480acaa1c2f298ddfecc0a33c7702381c4..ef1ab69928d230fd33b4bd8d41ee12ae83c7fa58 100644 (file)
--- a/gdb/testsuite/gdb.gdb/python-selftest.exp
+++ b/gdb/testsuite/gdb.gdb/python-selftest.exp
@@ -22,7 +22,7 @@ proc selftest_python {} {
     }
 
     gdb_test_no_output "set variable gdb_python_initialized = 0"
-    gdb_test "call catch_command_errors(execute_command, \"python print(5)\", 0, RETURN_MASK_ALL)" \
+    gdb_test "call catch_command_errors(execute_command, \"python print(5)\", 0)" \
        "Python not initialized.* = 0"
     return 0
 }