Convert generic probe interface to C++ (and perform some cleanups)

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

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 59a7b64ae88811e710057d67ee2c454e01a7633a..76d05dfc13bc6c3b1a49b21408cf85e6042f3e4b 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1654,11 +1654,9 @@ start_tracing (const char *notes)
       t->number_on_target = b->number;
 
       for (loc = b->loc; loc; loc = loc->next)
-       if (loc->probe.probe != NULL
-           && loc->probe.probe->pops->set_semaphore != NULL)
-         loc->probe.probe->pops->set_semaphore (loc->probe.probe,
-                                                loc->probe.objfile,
-                                                loc->gdbarch);
+       if (loc->probe.prob != NULL)
+         loc->probe.prob->set_semaphore (loc->probe.objfile,
+                                         loc->gdbarch);
 
       if (bp_location_downloaded)
        observer_notify_breakpoint_modified (b);
@@ -1754,11 +1752,9 @@ stop_tracing (const char *note)
             but we don't really care if this semaphore goes out of sync.
             That's why we are decrementing it here, but not taking care
             in other places.  */
-         if (loc->probe.probe != NULL
-             && loc->probe.probe->pops->clear_semaphore != NULL)
-           loc->probe.probe->pops->clear_semaphore (loc->probe.probe,
-                                                    loc->probe.objfile,
-                                                    loc->gdbarch);
+         if (loc->probe.prob != NULL)
+           loc->probe.prob->clear_semaphore (loc->probe.objfile,
+                                             loc->gdbarch);
        }
     }