From 511785011b1bd7092d9e093f6e954c131d83a3a0 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Fri, 15 May 2009 14:10:57 -0700
Subject: Break the dwflpp dependence on query_module

---
 dwflpp.cxx  |  7 -------
 dwflpp.h    |  3 ---
 tapsets.cxx | 10 +++++-----
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/dwflpp.cxx b/dwflpp.cxx
index a13339ce..c884a3ab 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -404,13 +404,6 @@ dwflpp::iterate_over_modules(int (* callback)(Dwfl_Module *, void **,
 }
 
 
-void
-dwflpp::query_modules(base_query *q)
-{
-  iterate_over_modules(&query_module, q);
-}
-
-
 void
 dwflpp::iterate_over_cus (int (*callback)(Dwarf_Die * die, void * arg),
                           void * data)
diff --git a/dwflpp.h b/dwflpp.h
index 5ae00131..3cd2a444 100644
--- a/dwflpp.h
+++ b/dwflpp.h
@@ -63,8 +63,6 @@ typedef std::vector<inline_instance_info> inline_instance_map_t;
 
 /* XXX FIXME functions that dwflpp needs from tapsets.cxx */
 int query_cu (Dwarf_Die * cudie, void * arg);
-int query_module (Dwfl_Module *mod, void **, const char *name,
-                  Dwarf_Addr addr, void *arg);
 func_info_map_t *get_filtered_functions(dwarf_query *q);
 inline_instance_map_t *get_filtered_inlines(dwarf_query *q);
 void add_label_name(dwarf_query *q, const char *name);
@@ -214,7 +212,6 @@ struct dwflpp
                                              const char *, Dwarf_Addr,
                                              void *),
                             base_query *data);
-  void query_modules(base_query *q);
 
   typedef std::map<Dwarf*, std::vector<Dwarf_Die>*> module_cu_cache_t;
   module_cu_cache_t module_cu_cache;
diff --git a/tapsets.cxx b/tapsets.cxx
index 3437205f..25b729d8 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -1894,7 +1894,7 @@ lookup_symbol_address (Dwfl_Module *m, const char* wanted)
 
 
 
-int
+static int
 query_module (Dwfl_Module *mod,
               void **,
 	      const char *name,
@@ -2756,7 +2756,7 @@ void dwarf_cast_expanding_visitor::visit_cast_op (cast_op* e)
 	}
 
       dwarf_cast_query q (*dw, module, *e, lvalue, type, code);
-      dw->query_modules(&q);
+      dw->iterate_over_modules(&query_module, &q);
     }
 
   if (code.empty())
@@ -3497,7 +3497,7 @@ dwarf_builder::build(systemtap_session & sess,
 	    
 	    dwarf_query q(sess, base, location, *dw, parameters, finished_results);
 	    q.has_mark = true;
-	    dw->query_modules(&q);
+	    dw->iterate_over_modules(&query_module, &q);
 	    if (sess.listing_mode)
 	      {
 		finished_results.back()->locations[0]->components[1]->functor = TOK_MARK;
@@ -3554,7 +3554,7 @@ dwarf_builder::build(systemtap_session & sess,
       return;
     }
 
-  dw->query_modules(&q);
+  dw->iterate_over_modules(&query_module, &q);
 }
 
 symbol_table::~symbol_table()
@@ -5700,7 +5700,7 @@ tracepoint_builder::build(systemtap_session& s,
   assert(get_param (parameters, TOK_TRACE, tracepoint));
 
   tracepoint_query q(*dw, tracepoint, base, location, finished_results);
-  dw->query_modules(&q);
+  dw->iterate_over_modules(&query_module, &q);
 }
 
 
-- 
cgit