s/NO_FUNCTION/NULL/

gdb/ChangeLog

@@ -1,3 +1,12 @@
+2002-02-01  Andrew Cagney  <ac131313@redhat.com>
+
+	* command.h (NO_FUNCTION): Delete macro.
+	* cli/cli-decode.h (NO_FUNCTION): Ditto.
+	* top.c (execute_command): Replace NO_FUNCTION with NULL.
+	* tracepoint.c (_initialize_tracepoint): Ditto.
+	* cli/cli-decode.c (add_set_cmd): Ditto.
+	* cli/cli-cmds.c (init_cli_cmds): Ditto.
+	
 2002-02-01  Daniel Jacobowitz  <drow@mvista.com>
 
 	* gnu-v3-abi.c (gnuv3_virtual_fn_field): Update comments.

gdb/cli/cli-cmds.c

@@ -604,24 +604,24 @@ init_cli_cmds (void)
   /* Define the classes of commands.
      They will appear in the help list in the reverse of this order.  */
 
-  add_cmd ("internals", class_maintenance, NO_FUNCTION,
+  add_cmd ("internals", class_maintenance, NULL,
 	   "Maintenance commands.\n\
 Some gdb commands are provided just for use by gdb maintainers.\n\
 These commands are subject to frequent change, and may not be as\n\
 well documented as user commands.",
 	   &cmdlist);
-  add_cmd ("obscure", class_obscure, NO_FUNCTION, "Obscure features.", &cmdlist);
+  add_cmd ("obscure", class_obscure, NULL, "Obscure features.", &cmdlist);
-  add_cmd ("aliases", class_alias, NO_FUNCTION, "Aliases of other commands.", &cmdlist);
+  add_cmd ("aliases", class_alias, NULL, "Aliases of other commands.", &cmdlist);
-  add_cmd ("user-defined", class_user, NO_FUNCTION, "User-defined commands.\n\
+  add_cmd ("user-defined", class_user, NULL, "User-defined commands.\n\
 The commands in this class are those defined by the user.\n\
 Use the \"define\" command to define a command.", &cmdlist);
-  add_cmd ("support", class_support, NO_FUNCTION, "Support facilities.", &cmdlist);
+  add_cmd ("support", class_support, NULL, "Support facilities.", &cmdlist);
   if (!dbx_commands)
-    add_cmd ("status", class_info, NO_FUNCTION, "Status inquiries.", &cmdlist);
+    add_cmd ("status", class_info, NULL, "Status inquiries.", &cmdlist);
-  add_cmd ("files", class_files, NO_FUNCTION, "Specifying and examining files.", &cmdlist);
+  add_cmd ("files", class_files, NULL, "Specifying and examining files.", &cmdlist);
-  add_cmd ("breakpoints", class_breakpoint, NO_FUNCTION, "Making program stop at certain points.", &cmdlist);
+  add_cmd ("breakpoints", class_breakpoint, NULL, "Making program stop at certain points.", &cmdlist);
-  add_cmd ("data", class_vars, NO_FUNCTION, "Examining data.", &cmdlist);
+  add_cmd ("data", class_vars, NULL, "Examining data.", &cmdlist);
-  add_cmd ("stack", class_stack, NO_FUNCTION, "Examining the stack.\n\
+  add_cmd ("stack", class_stack, NULL, "Examining the stack.\n\
 The stack is made up of stack frames.  Gdb assigns numbers to stack frames\n\
 counting from zero for the innermost (currently executing) frame.\n\n\
 At any time gdb identifies one frame as the \"selected\" frame.\n\
@@ -629,7 +629,7 @@ Variable lookups are done with respect to the selected frame.\n\
 When the program being debugged stops, gdb selects the innermost frame.\n\
 The commands below can be used to select other frames by number or address.",
 	   &cmdlist);
-  add_cmd ("running", class_run, NO_FUNCTION, "Running the program.", &cmdlist);
+  add_cmd ("running", class_run, NULL, "Running the program.", &cmdlist);
 
   /* Define general commands. */
 

gdb/cli/cli-decode.c

@@ -237,13 +237,12 @@ add_set_cmd (char *name,
 	     char *doc,
 	     struct cmd_list_element **list)
 {
-  struct cmd_list_element *c
+  struct cmd_list_element *c = add_cmd (name, class, NULL, doc, list);
-  = add_cmd (name, class, NO_FUNCTION, doc, list);
 
   c->type = set_cmd;
   c->var_type = var_type;
   c->var = var;
-  /* This needs to be something besides NO_FUNCTION so that this isn't
+  /* This needs to be something besides NULL so that this isn't
      treated as a help class.  */
   c->function.sfunc = empty_sfunc;
   return c;

gdb/cli/cli-decode.h

@@ -120,9 +120,8 @@ struct cmd_list_element
     /* Command class; class values are chosen by application program.  */
     enum command_class class;
 
-    /* Function definition of this command.
+    /* Function definition of this command.  NULL for command class
-       NO_FUNCTION for command class names and for help topics that
+       names and for help topics that are not really commands.  */
-       are not really commands.  */
     union
       {
 	/* If type is not_set_cmd, call it like this:  */
@@ -133,7 +132,6 @@ struct cmd_list_element
 	void (*sfunc) (char *args, int from_tty, struct cmd_list_element * c);
       }
     function;
-#define NO_FUNCTION ((void (*) (char *args, int from_tty)) 0)
 
     /* Documentation of this command (or help topic).
        First line is brief documentation; remaining lines form, with it,

gdb/command.h

@@ -126,9 +126,8 @@ struct cmd_list_element
     /* Command class; class values are chosen by application program.  */
     enum command_class class;
 
-    /* Function definition of this command.
+    /* Function definition of this command.  NULL for command class
-       NO_FUNCTION for command class names and for help topics that
+       names and for help topics that are not really commands.  */
-       are not really commands.  */
     union
       {
 	/* If type is not_set_cmd, call it like this:  */
@@ -139,7 +138,6 @@ struct cmd_list_element
 	void (*sfunc) (char *args, int from_tty, struct cmd_list_element * c);
       }
     function;
-#define NO_FUNCTION ((void (*) (char *args, int from_tty)) 0)
 
     /* Documentation of this command (or help topic).
        First line is brief documentation; remaining lines form, with it,

gdb/top.c

@@ -698,7 +698,7 @@ execute_command (char *p, int from_tty)
 	execute_user_command (c, arg);
       else if (c->type == set_cmd || c->type == show_cmd)
 	do_setshow_command (arg, from_tty & caution, c);
-      else if (c->function.cfunc == NO_FUNCTION)
+      else if (c->function.cfunc == NULL)
 	error ("That is not a command, just a help topic.");
       else if (call_command_hook)
 	call_command_hook (c, arg, from_tty & caution);

gdb/tracepoint.c

@@ -2661,7 +2661,7 @@ _initialize_tracepoint (void)
   add_info ("scope", scope_info,
 	    "List the variables local to a scope");
 
-  add_cmd ("tracepoints", class_trace, NO_FUNCTION,
+  add_cmd ("tracepoints", class_trace, NULL,
 	   "Tracing of program execution without stopping the program.",
 	   &cmdlist);
 

gdb/tui/ChangeLog

@@ -1,3 +1,7 @@
+2002-02-01  Andrew Cagney  <ac131313@redhat.com>
+
+	* tuiWin.c (_initialize_tuiWin): Replace NO_FUNCTION with NULL.
+
 2001-10-20  Andrew Cagney  <ac131313@redhat.com>
 
 	* tuiDisassem.c: Include "value.h".

gdb/tui/tuiWin.c

@@ -280,7 +280,7 @@ _initialize_tuiWin (void)
 
   /* Define the classes of commands.
      They will appear in the help list in the reverse of this order.  */
-  add_cmd ("tui", class_tui, NO_FUNCTION,
+  add_cmd ("tui", class_tui, NULL,
 	   "Text User Interface commands.",
 	   &cmdlist);