Replace CONST with const

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

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index fbe377e02a1f3adbcca1b30f6583f55a26b47e0f..57d2ae2a29d69080bbd242fec12ac0307bf27d04 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -357,7 +357,7 @@ set_raw_tracepoint (struct symtab_and_line sal)
   t->language = current_language->la_language;
   t->input_radix = input_radix;
   t->line_number = sal.line;
-  t->enabled = enabled;
+  t->enabled_p = 1;
   t->next = 0;
   t->step_count = 0;
   t->pass_count = 0;
@@ -494,7 +494,7 @@ tracepoints_info (char *tpnum_exp, int from_tty)
        }
 
       printf_filtered ("%-3d %-3s ", t->number,
-                      t->enabled == enabled ? "y" : "n");
+                      t->enabled_p ? "y" : "n");
       if (addressprint)
        {
          char *tmp;
@@ -569,11 +569,11 @@ tracepoint_operation (struct tracepoint *t, int from_tty,
   switch (opcode)
     {
     case enable_op:
-      t->enabled = enabled;
+      t->enabled_p = 1;
       tracepoint_modify_event (t->number);
       break;
     case disable_op:
-      t->enabled = disabled;
+      t->enabled_p = 0;
       tracepoint_modify_event (t->number);
       break;
     case delete_op:
@@ -825,6 +825,11 @@ read_actions (struct tracepoint *t)
   /* Control-C quits instantly if typed while in this loop
      since it should not wait until the user types a newline.  */
   immediate_quit++;
+  /* FIXME: kettenis/20010823: Something is wrong here.  In this file
+     STOP_SIGNAL is never defined.  So this code has been left out, at
+     least for quite a while now.  Replacing STOP_SIGNAL with SIGTSTP
+     leads to compilation failures since the variable job_control
+     isn't declared.  Leave this alone for now.  */
 #ifdef STOP_SIGNAL
   if (job_control)
     {
@@ -1291,16 +1296,14 @@ add_local_symbols (struct collection_list *collect, CORE_ADDR pc,
 {
   struct symbol *sym;
   struct block *block;
-  int i, nsyms, count = 0;
+  int i, count = 0;
 
   block = block_for_pc (pc);
   while (block != 0)
     {
       QUIT;                    /* allow user to bail out with ^C */
-      nsyms = BLOCK_NSYMS (block);
-      for (i = 0; i < nsyms; i++)
+      ALL_BLOCK_SYMBOLS (block, i, sym)
        {
-         sym = BLOCK_SYM (block, i);
          switch (SYMBOL_CLASS (sym))
            {
            default:
@@ -1488,7 +1491,8 @@ encode_actions (struct tracepoint *t, char ***tdp_actions,
   struct collection_list *collect;
   struct cmd_list_element *cmd;
   struct agent_expr *aexpr;
-  long frame_reg, frame_offset;
+  int frame_reg;
+  LONGEST frame_offset;
 
 
   clear_collection_list (&tracepoint_list);
@@ -1735,7 +1739,7 @@ trace_start_command (char *args, int from_tty)
 
        sprintf_vma (tmp, t->address);
        sprintf (buf, "QTDP:%x:%s:%c:%lx:%x", t->number, tmp, /* address */
-                t->enabled == enabled ? 'E' : 'D',
+                t->enabled_p ? 'E' : 'D',
                 t->step_count, t->pass_count);
 
        if (t->actions)
@@ -2329,7 +2333,7 @@ scope_info (char *args, int from_tty)
   struct minimal_symbol *msym;
   struct block *block;
   char **canonical, *symname, *save_args = args;
-  int i, j, nsyms, count = 0;
+  int i, j, count = 0;
 
   if (args == 0 || *args == 0)
     error ("requires an argument (function, line or *addr) to define a scope");
@@ -2345,14 +2349,13 @@ scope_info (char *args, int from_tty)
   while (block != 0)
     {
       QUIT;                    /* allow user to bail out with ^C */
-      nsyms = BLOCK_NSYMS (block);
-      for (i = 0; i < nsyms; i++)
+      ALL_BLOCK_SYMBOLS (block, i, sym)
        {
          QUIT;                 /* allow user to bail out with ^C */
          if (count == 0)
            printf_filtered ("Scope for %s:\n", save_args);
          count++;
-         sym = BLOCK_SYM (block, i);
+
          symname = SYMBOL_NAME (sym);
          if (symname == NULL || *symname == '\0')
            continue;           /* probably botched, certainly useless */