helper/command: remove unused functions and make static local ones

The function command_find_in_parent() is never used in OpenOCD, so
remove it.

The functions command_name() and [un]register_command() are only
used internally in command.c, so make them static.

Change-Id: Ide9842659796f4884fb6c1fcf5979b3b71b67abb
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5663
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Tested-by: jenkins

diff --git a/src/helper/command.c b/src/helper/command.c
index 193867fe8c5eb5bc06e3f81e3be6e00859a9b9bd..271e7b993fb46355c191953ac9cec0ce46c52587 100644 (file)
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -52,6 +52,10 @@ struct log_capture_state {
        Jim_Obj *output;
 };
 
        Jim_Obj *output;
 };
 

+static int unregister_command(struct command_context *context,
+       struct command *parent, const char *name);
+static char *command_name(struct command *c, char delim);
+

 static void tcl_output(void *privData, const char *file, unsigned line,
        const char *function, const char *string)
 {
 static void tcl_output(void *privData, const char *file, unsigned line,
        const char *function, const char *string)
 {


@@ -242,11 +246,6 @@ struct command *command_find_in_context(struct command_context *cmd_ctx,
 {
        return command_find(cmd_ctx->commands, name);
 }
 {
        return command_find(cmd_ctx->commands, name);
 }

-struct command *command_find_in_parent(struct command *parent,
-       const char *name)
-{
-       return command_find(parent->children, name);
-}

 
 /**
  * Add the command into the linked list, sorted by name.
 
 /**
  * Add the command into the linked list, sorted by name.


@@ -358,7 +357,7 @@ static int register_command_handler(struct command_context *cmd_ctx,
        return retval;
 }
 
        return retval;
 }
 

-struct command *register_command(struct command_context *context,
+static struct command *register_command(struct command_context *context,

        struct command *parent, const struct command_registration *cr)
 {
        if (!context || !cr->name)
        struct command *parent, const struct command_registration *cr)
 {
        if (!context || !cr->name)


@@ -440,7 +439,7 @@ int unregister_all_commands(struct command_context *context,
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }
 

-int unregister_command(struct command_context *context,
+static int unregister_command(struct command_context *context,

        struct command *parent, const char *name)
 {
        if ((!context) || (!name))
        struct command *parent, const char *name)
 {
        if ((!context) || (!name))


@@ -548,7 +547,7 @@ static char *__command_name(struct command *c, char delim, unsigned extra)
        return name;
 }
 
        return name;
 }
 

-char *command_name(struct command *c, char delim)
+static char *command_name(struct command *c, char delim)

 {
        return __command_name(c, delim, 0);
 }
 {
        return __command_name(c, delim, 0);
 }

diff --git a/src/helper/command.h b/src/helper/command.h
index a20c4620dda08ef0aa1675929b75e025df43dc9b..886bde86b6289c6505ae4d44da6e59711243fdb7 100644 (file)
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -195,19 +195,9 @@ struct command {
        struct command *next;
 };
 
        struct command *next;
 };
 

-/**
- * @param c The command to be named.
- * @param delim The character to place between command names.
- * @returns A malloc'd string containing the full command name,
- * which may include one or more ancestor components.  Multiple names
- * are separated by single spaces.  The caller must free() the string
- * when done with it.
- */
-char *command_name(struct command *c, char delim);
-

 /*
  * Commands should be registered by filling in one or more of these
 /*
  * Commands should be registered by filling in one or more of these

- * structures and passing them to register_command().
+ * structures and passing them to [un]register_commands().

  *
  * A conventioal format should be used for help strings, to provide both
  * usage and basic information:
  *
  * A conventioal format should be used for help strings, to provide both
  * usage and basic information:


@@ -243,24 +233,6 @@ struct command_registration {
 /** Use this as the last entry in an array of command_registration records. */
 #define COMMAND_REGISTRATION_DONE { .name = NULL, .chain = NULL }
 
 /** Use this as the last entry in an array of command_registration records. */
 #define COMMAND_REGISTRATION_DONE { .name = NULL, .chain = NULL }
 

-/**
- * Register a command @c handler that can be called from scripts during
- * the execution @c mode specified.
- *
- * If @c parent is non-NULL, the new command will be registered as a
- * sub-command under it; otherwise, it will be available as a top-level
- * command.
- *
- * @param cmd_ctx The command_context in which to register the command.
- * @param parent Register this command as a child of this, or NULL to
- * register a top-level command.
- * @param rec A command_registration record that contains the desired
- * command parameters.
- * @returns The new command, if successful; otherwise, NULL.
- */
-struct command *register_command(struct command_context *cmd_ctx,
-                                struct command *parent, const struct command_registration *rec);
-

 /**
  * Register one or more commands in the specified context, as children
  * of @c parent (or top-level commends, if NULL).  In a registration's
 /**
  * Register one or more commands in the specified context, as children
  * of @c parent (or top-level commends, if NULL).  In a registration's


@@ -279,16 +251,6 @@ struct command *register_command(struct command_context *cmd_ctx,
 int register_commands(struct command_context *cmd_ctx, struct command *parent,
                const struct command_registration *cmds);
 
 int register_commands(struct command_context *cmd_ctx, struct command *parent,
                const struct command_registration *cmds);
 

-
-/**
- * Unregisters command @c name from the given context, @c cmd_ctx.
- * @param cmd_ctx The context of the registered command.
- * @param parent The parent of the given command, or NULL.
- * @param name The name of the command to unregister.
- * @returns ERROR_OK on success, or an error code.
- */
-int unregister_command(struct command_context *cmd_ctx,
-               struct command *parent, const char *name);

 /**
  * Unregisters all commands from the specfied context.
  * @param cmd_ctx The context that will be cleared of registered commands.
 /**
  * Unregisters all commands from the specfied context.
  * @param cmd_ctx The context that will be cleared of registered commands.


@@ -300,8 +262,6 @@ int unregister_all_commands(struct command_context *cmd_ctx,
 
 struct command *command_find_in_context(struct command_context *cmd_ctx,
                const char *name);
 
 struct command *command_find_in_context(struct command_context *cmd_ctx,
                const char *name);

-struct command *command_find_in_parent(struct command *parent,
-               const char *name);

 
 /**
  * Update the private command data field for a command and all descendents.
 
 /**
  * Update the private command data field for a command and all descendents.