2012-07-18 Sergio Durigan Junior <sergiodj@redhat.com>

	* probe.c (probe_safe_evaluate_at_pc): Rename variable `n_probes'.
	* stap-probe.c (compile_probe_arg): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c2dcc40421b932390ddd7a514d122dfdb1f9415a..31f15c225d922eb68d377fa359deed0cbc19fad8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-18  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+       * probe.c (probe_safe_evaluate_at_pc): Rename variable `n_probes'.
+       * stap-probe.c (compile_probe_arg): Likewise.
+
 2012-07-18  Sergio Durigan Junior  <sergiodj@redhat.com>
 
        * elfread.c (elf_get_probe_argument_count): Remove `objfile' argument.

diff --git a/gdb/probe.c b/gdb/probe.c
index 67482f29a002f9f89334876c2aea33d3e224eb8d..e7cc891894f9ee04d231f88e3b41ce130b23bceb 100644 (file)
--- a/gdb/probe.c
+++ b/gdb/probe.c
@@ -637,7 +637,7 @@ probe_safe_evaluate_at_pc (struct frame_info *frame, unsigned n)
 {
   struct probe *probe;
   const struct sym_probe_fns *probe_fns;
-  unsigned n_probes;
+  unsigned n_args;
 
   probe = find_probe_by_pc (get_frame_pc (frame));
   if (!probe)
@@ -648,9 +648,9 @@ probe_safe_evaluate_at_pc (struct frame_info *frame, unsigned n)
   gdb_assert (probe->objfile->sf->sym_probe_fns != NULL);
 
   probe_fns = probe->objfile->sf->sym_probe_fns;
-  n_probes = probe_fns->sym_get_probe_argument_count (probe);
+  n_args = probe_fns->sym_get_probe_argument_count (probe);
 
-  if (n >= n_probes)
+  if (n >= n_args)
     return NULL;
 
   return probe_fns->sym_evaluate_probe_argument (probe, n);

diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
index 07f5a60e24bcb2483343473f1edd84373dfa9bad..91f3c302c1d0f5c06ab2c6a36c2d2d61c33c4627 100644 (file)
--- a/gdb/stap-probe.c
+++ b/gdb/stap-probe.c
@@ -1160,7 +1160,7 @@ compile_probe_arg (struct internalvar *ivar, struct agent_expr *expr,
   int sel = (int) (uintptr_t) data;
   struct probe *pc_probe;
   const struct sym_probe_fns *pc_probe_fns;
-  int n_probes;
+  int n_args;
 
   /* SEL == -1 means "_probe_argc".  */
   gdb_assert (sel >= -1);
@@ -1175,20 +1175,20 @@ compile_probe_arg (struct internalvar *ivar, struct agent_expr *expr,
 
   pc_probe_fns = pc_probe->objfile->sf->sym_probe_fns;
 
-  n_probes = pc_probe_fns->sym_get_probe_argument_count (pc_probe);
+  n_args = pc_probe_fns->sym_get_probe_argument_count (pc_probe);
 
   if (sel == -1)
     {
       value->kind = axs_rvalue;
       value->type = builtin_type (expr->gdbarch)->builtin_int;
-      ax_const_l (expr, n_probes);
+      ax_const_l (expr, n_args);
       return;
     }
 
   gdb_assert (sel >= 0);
-  if (sel >= n_probes)
+  if (sel >= n_args)
     error (_("Invalid probe argument %d -- probe has %d arguments available"),
-          sel, n_probes);
+          sel, n_args);
 
   pc_probe_fns->sym_compile_to_ax (pc_probe, expr, value, sel);
 }