add command_output_handler_t

Add a typedef for command output handler function type, simplifying
the appearance of functions that use it and eliminating duplicate code.

diff --git a/src/helper/command.c b/src/helper/command.c
index f960127d8b9e20cdabecb999048fb95323d16dc4..603da82f65c67cc80f82f5c615b36e05cd12ea61 100644 (file)
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -558,7 +558,8 @@ int command_run_linef(command_context_t *context, const char *format, ...)
        return retval;
 }
 
-void command_set_output_handler(command_context_t* context, int (*output_handler)(struct command_context_s *context, const char* line), void *priv)
+void command_set_output_handler(command_context_t* context,
+               command_output_handler_t output_handler, void *priv)
 {
        context->output_handler = output_handler;
        context->output_handler_priv = priv;

diff --git a/src/helper/command.h b/src/helper/command.h
index 732fa525ade98678d252c28bd43b98f328f8103f..ded76feecbc0890b7224f587a0ceb42af6425c9f 100644 (file)
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -51,6 +51,12 @@ enum command_mode
        COMMAND_ANY,
 };
 
+struct command_context_s;
+
+/// The type signature for command context's output handler.
+typedef int (*command_output_handler_t)(struct command_context_s *context,
+                               const char* line);
+
 typedef struct command_context_s
 {
        enum command_mode mode;
@@ -70,7 +76,7 @@ typedef struct command_context_s
         * Returning ERROR_COMMAND_SYNTAX_ERROR will have the effect of
         * printing out the syntax of the command.
         */
-       int (*output_handler)(struct command_context_s *context, const char* line);
+       command_output_handler_t output_handler;
        void *output_handler_priv;
 } command_context_t;
 
@@ -104,8 +110,7 @@ int unregister_command(command_context_t *context, char *name);
 int unregister_all_commands(command_context_t *context);
 
 void command_set_output_handler(command_context_t* context,
-               int (*output_handler)(struct command_context_s *context,
-               const char* line), void *priv);
+               command_output_handler_t output_handler, void *priv);
 
 command_context_t* copy_command_context(command_context_t* context);