Função para iniciar todos os comandos.

diff --git a/lib/declaracao.c b/lib/declaracao.c
index fd3c998..39bca5d 100644 (file)
--- a/lib/declaracao.c
+++ b/lib/declaracao.c
@@ -32,6 +32,11 @@
 #include "dependente.h"
 #include "pmhash.h"
 
+#include "base.h"
+#include "calcula.h"
+#include "gera.h"
+#include "help.h"
+
 struct declaracao * declaracao_new(int ano)
 {
        struct declaracao *dec;
@@ -120,3 +125,19 @@ void dec_set_error(struct declaracao *dec, char *fmt, ...)
        vasprintf(&dec->error, fmt, ap);
        va_end(ap);
 }
+
+void dec_cmd_init(void)
+{
+       base_cmd_init();
+       contribuinte_cmd_init();
+       conjuge_cmd_init();
+       rendimento_cmd_init();
+       isento_cmd_init();
+       pagamento_cmd_init();
+       bem_cmd_init();
+       dependente_cmd_init();
+       calcula_cmd_init();
+       gera_cmd_init();
+       sistema_cmd_init();
+       help_cmd_init();
+}

diff --git a/lib/declaracao.h b/lib/declaracao.h
index e1f0f3d..ee18949 100644 (file)
--- a/lib/declaracao.h
+++ b/lib/declaracao.h
@@ -69,4 +69,6 @@ void declaracao_free(struct declaracao *dec);
 
 void dec_set_error(struct declaracao *dec, char *fmt, ...);
 
+void dec_cmd_init(void);
+
 #endif

diff --git a/src/declara.c b/src/declara.c
index 8710d6a..6674320 100644 (file)
--- a/src/declara.c
+++ b/src/declara.c
@@ -28,17 +28,6 @@
 
 #include "declaracao.h"
 #include "cmd.h"
-#include "base.h"
-#include "contribuinte.h"
-#include "conjuge.h"
-#include "rendimento.h"
-#include "isento.h"
-#include "pagamento.h"
-#include "bem.h"
-#include "dependente.h"
-#include "calcula.h"
-#include "gera.h"
-#include "help.h"
 
 static int readline_support = 1;
 
@@ -124,18 +113,7 @@ int main(int argc, char **argv)
                usage();
 
        cmd_init();
-       base_cmd_init();
-       contribuinte_cmd_init();
-       conjuge_cmd_init();
-       rendimento_cmd_init();
-       isento_cmd_init();
-       pagamento_cmd_init();
-       bem_cmd_init();
-       dependente_cmd_init();
-       calcula_cmd_init();
-       gera_cmd_init();
-       sistema_cmd_init();
-       help_cmd_init();
+       dec_cmd_init();
 
        if (argc > 1)
                filename = argv[1];