cmdline: big rework and clean of cmdline library

[libcmdline.git] / src / lib / cmdline_parse_num.c

diff --git a/src/lib/cmdline_parse_num.c b/src/lib/cmdline_parse_num.c
index 8ef2964..31ca78d 100644 (file)
--- a/src/lib/cmdline_parse_num.c
+++ b/src/lib/cmdline_parse_num.c
@@ -71,14 +71,6 @@
 //#define debug_printf(args...) printf(args)
 #define debug_printf(args...) do {} while(0)
 
-struct cmdline_token_ops cmdline_token_num_ops = {
-       .parse = cmdline_parse_num,
-       .complete_get_nb = NULL,
-       .complete_get_elt = NULL,
-       .get_help = cmdline_get_help_num,
-};
-
-
 enum num_parse_state_t {
        START,
        DEC_NEG,
@@ -109,7 +101,7 @@ static const char * num_help[] = {
 #endif
 };
 
-static inline int
+static int
 add_to_res(unsigned int c, uint64_t *res, unsigned int base)
 {
        /* overflow */
@@ -121,7 +113,8 @@ add_to_res(unsigned int c, uint64_t *res, unsigned int base)
        return 0;
 }
 
-static int check_res_size(struct cmdline_token_num_data *nd, unsigned ressize)
+static int
+check_res_size(struct cmdline_token_num_data *nd, unsigned ressize)
 {
        switch (nd->type) {
                case INT8:
@@ -157,7 +150,7 @@ static int check_res_size(struct cmdline_token_num_data *nd, unsigned ressize)
 }
 
 /* parse an int or a float */
-int
+static int
 cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf,
                  void *res, unsigned ressize)
 {
@@ -510,8 +503,8 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf,
 
 
 /* parse an int or a float */
-int
-cmdline_get_help_num(cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int size)
+static int
+cmdline_help_num(cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int size)
 {
        struct cmdline_token_num_data nd;
 
@@ -525,3 +518,12 @@ cmdline_get_help_num(cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int s
        dstbuf[size-1] = '\0';
        return 0;
 }
+
+
+struct cmdline_token_ops cmdline_token_num_ops = {
+       .parse = cmdline_parse_num,
+       .complete_start = NULL,
+       .complete_iterate = NULL,
+       .complete_end = NULL,
+       .help = cmdline_help_num,
+};