Move macros de comandos para definir inteiros e strings.

Move macros de comandos para definir inteiros e strings para cabeçalho
de utilitários.

Isto permitirá que outros módulos utilizem estas macros. Ainda há um
descasamento na API para set_long versus set_int e set_string.

diff --git a/base.c b/base.c
index 5efa51e..1477ca8 100644 (file)
--- a/base.c
+++ b/base.c
@@ -22,60 +22,7 @@
 #include <string.h>
 #include <errno.h>
 #include "rendimento.h"
-
-static int set_int(char **args, int argc, int *val)
-{
-       char *end = NULL;
-       if (argc != 2)
-               return -EINVAL;
-       errno = 0;
-       *val = strtol(args[1], &end, 0);
-       if (end && *end)
-               return -EINVAL;
-       if (errno == ERANGE)
-               return -ERANGE;
-       return 0;
-}
-
-static int set_string(char **args, int argc, char **str)
-{
-       if (argc != 2)
-               return -EINVAL;
-       *str = strdup(args[1]);
-       if (!*str)
-               return -errno;
-       return 0;
-}
-
-#define SET_INT(attr) \
-static int run_##attr(struct declaracao *dec, char **args, int argc) \
-{ \
-       int val; \
-       int r = set_int(args, argc, &val); \
-       if (r) \
-               return r; \
-       dec->attr = val; \
-       return 0; \
-} \
-static struct cmd cmd_##attr = { \
-       .name = #attr, \
-       .run = run_##attr, \
-};
-
-#define SET_STRING(attr) \
-static int run_##attr(struct declaracao *dec, char **args, int argc) \
-{ \
-       char *val; \
-       int r = set_string(args, argc, &val); \
-       if (r) \
-               return r; \
-       dec->attr = val; \
-       return 0; \
-} \
-static struct cmd cmd_##attr = { \
-       .name = #attr, \
-       .run = run_##attr, \
-}
+#include "util.h"
 
 SET_INT(ano);
 SET_STRING(cpf);

diff --git a/util.c b/util.c
index 973da1e..90ca426 100644 (file)
--- a/util.c
+++ b/util.c
@@ -19,6 +19,7 @@
 #include "util.h"
 #include <stdlib.h>
 #include <errno.h>
+#include <string.h>
 
 int set_llong(char *str, long long *val)
 {
@@ -31,3 +32,27 @@ int set_llong(char *str, long long *val)
                return -ERANGE;
        return 0;
 }
+
+int set_int(char **args, int argc, int *val)
+{
+       char *end = NULL;
+       if (argc != 2)
+               return -EINVAL;
+       errno = 0;
+       *val = strtol(args[1], &end, 0);
+       if (end && *end)
+               return -EINVAL;
+       if (errno == ERANGE)
+               return -ERANGE;
+       return 0;
+}
+
+int set_string(char **args, int argc, char **str)
+{
+       if (argc != 2)
+               return -EINVAL;
+       *str = strdup(args[1]);
+       if (!*str)
+               return -errno;
+       return 0;
+}

diff --git a/util.h b/util.h
index 0c8a391..cf5effb 100644 (file)
--- a/util.h
+++ b/util.h
@@ -20,5 +20,37 @@
 #define _UTIL_H
 
 int set_llong(char *str, long long *val);
+int set_int(char **args, int argc, int *val);
+int set_string(char **args, int argc, char **str);
+
+#define SET_INT(attr) \
+static int run_##attr(struct declaracao *dec, char **args, int argc) \
+{ \
+       int val; \
+       int r = set_int(args, argc, &val); \
+       if (r) \
+               return r; \
+       dec->attr = val; \
+       return 0; \
+} \
+static struct cmd cmd_##attr = { \
+       .name = #attr, \
+       .run = run_##attr, \
+};
+
+#define SET_STRING(attr) \
+static int run_##attr(struct declaracao *dec, char **args, int argc) \
+{ \
+       char *val; \
+       int r = set_string(args, argc, &val); \
+       if (r) \
+               return r; \
+       dec->attr = val; \
+       return 0; \
+} \
+static struct cmd cmd_##attr = { \
+       .name = #attr, \
+       .run = run_##attr, \
+}
 
 #endif