gdb/

	* breakpoint.c (ep_is_catchpoint): Renamed to ...
	(is_catchpoint): ... it.
	(print_one_breakpoint_location): Caller update.
	* breakpoint.h: Update declaration.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9f0e29f176961af3d44e34cdaaa2357d1639e9cb..0744c315160b2df3b297c37701e270228a1ed68e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-24  Yao Qi  <yao@codesourcery.com>
+
+       * breakpoint.c (ep_is_catchpoint): Renamed to ...
+       (is_catchpoint): ... it.
+       (print_one_breakpoint_location): Caller update.
+       * breakpoint.h: Update declaration.
+
 2012-04-23  David S. Miller  <davem@davemloft.net>
 
        * configure.tgt (sparc-*-linux*): Set build_gdbserver to yes.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index be536bc90eff183d3c7eff8629afc55266cc4dfd..ceca22114a0a9fb025e9ed27b6ba86cef12084dc 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -3635,7 +3635,7 @@ breakpoint_thread_match (struct address_space *aspace, CORE_ADDR pc,
    in breakpoint.h.  */
 
 int
-ep_is_catchpoint (struct breakpoint *ep)
+is_catchpoint (struct breakpoint *ep)
 {
   return (ep->type == bp_catchpoint);
 }
@@ -5600,7 +5600,7 @@ print_one_breakpoint_location (struct breakpoint *b,
   if (!part_of_multiple && b->hit_count)
     {
       /* FIXME should make an annotation for this.  */
-      if (ep_is_catchpoint (b))
+      if (is_catchpoint (b))
        ui_out_text (uiout, "\tcatchpoint");
       else if (is_tracepoint (b))
        ui_out_text (uiout, "\ttracepoint");

diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index e0eeeaa950e4549f99610ab449ae7599df8a6ad8..e676659a935a789ddf9edf4f0473775d199b42a4 100644 (file)
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -1365,7 +1365,7 @@ extern void remove_thread_event_breakpoints (void);
 extern void disable_breakpoints_in_shlibs (void);
 
 /* This function returns TRUE if ep is a catchpoint.  */
-extern int ep_is_catchpoint (struct breakpoint *);
+extern int is_catchpoint (struct breakpoint *);
 
 /* Enable breakpoints and delete when hit.  Called with ARG == NULL
    deletes all breakpoints.  */