2013-08-30 Phil Muldoon <pmuldoon@redhat.com>

[deliverable/binutils-gdb.git] / gdb / break-catch-sig.c

diff --git a/gdb/break-catch-sig.c b/gdb/break-catch-sig.c
index 4b5ffae926d9842d2e15142e2c3a2fa9e83e5c0f..02d8b4ab6f9959be0509ecc9f747bec4a6257163 100644 (file)
--- a/gdb/break-catch-sig.c
+++ b/gdb/break-catch-sig.c
@@ -199,13 +199,13 @@ signal_catchpoint_breakpoint_hit (const struct bp_location *bl,
            VEC_iterate (gdb_signal_type, c->signals_to_be_caught, i, iter);
            i++)
        if (signal_number == iter)
-         break;
+         return 1;
       /* Not the same.  */
-      if (!iter)
-       return 0;
+      gdb_assert (!iter);
+      return 0;
     }
-
-  return c->catch_all || !INTERNAL_SIGNAL (signal_number);
+  else
+    return c->catch_all || !INTERNAL_SIGNAL (signal_number);
 }
 
 /* Implement the "print_it" breakpoint_ops method for signal
@@ -351,7 +351,7 @@ signal_catchpoint_print_recreate (struct breakpoint *b, struct ui_file *fp)
    catchpoints.  */
 
 static enum bpstat_signal_value
-signal_catchpoint_explains_signal (struct breakpoint *b)
+signal_catchpoint_explains_signal (struct breakpoint *b, enum gdb_signal sig)
 {
   return BPSTAT_SIGNAL_PASS;
 }