Move macros de comandos para definir inteiros e strings.

[cascardo/declara.git] / base.c

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);