persist-tool: fix multiple definition of globals

MrAnno · MrAnno · commit aa9e87f0bb0a · 2020-02-04T23:46:24.000+01:00
Headers should not define variables. Including them into different
compilation units results in multiple definitions of the same name.

Detected with the -fno-common gcc flag.

Signed-off-by: László Várady &lt;laszlo.varady@protonmail.com&gt;
diff --git a/persist-tool/add.h b/persist-tool/add.h
@@ -32,8 +32,8 @@
 #include "cfg.h"
 #include "persist-tool.h"
 
-gchar *persist_state_dir;
-gchar *persist_state_name;
+extern gchar *persist_state_dir;
+extern gchar *persist_state_name;
 
 gint add_main(int argc, char *argv[]);
 
diff --git a/persist-tool/generate.h b/persist-tool/generate.h
@@ -32,8 +32,8 @@
 #include "persist-state.h"
 #include "cfg.h"
 
-gboolean force_generate;
-gchar *generate_output_dir;
+extern gboolean force_generate;
+extern gchar *generate_output_dir;
 
 gint generate_main(int argc, char *argv[]);
 
diff --git a/persist-tool/persist-tool.c b/persist-tool/persist-tool.c
@@ -135,11 +135,17 @@ void persist_tool_free(PersistTool *self)
   g_free(self);
 }
 
+gchar *persist_state_dir;
+gchar *persist_state_name;
+gboolean force_generate;
+gchar *generate_output_dir;
+
 static GOptionEntry dump_options[] =
 {
   { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL }
 };
 
+
 static GOptionEntry add_options[] =
 {
   { "output-dir", 'o', 0, G_OPTION_ARG_STRING, &persist_state_dir, "The directory where persist file is located.", "<directory>" },

Original file line number	Diff line number	Diff line change
`@@ -135,11 +135,17 @@ void persist_tool_free(PersistTool *self)`
`135`	`135`	`g_free(self);`
`136`	`136`	`}`
`137`	`137`
	`138`	`+gchar *persist_state_dir;`
	`139`	`+gchar *persist_state_name;`
	`140`	`+gboolean force_generate;`
	`141`	`+gchar *generate_output_dir;`
	`142`	`+`
`138`	`143`	`static GOptionEntry dump_options[] =`
`139`	`144`	`{`
`140`	`145`	`{ NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL }`
`141`	`146`	`};`
`142`	`147`
	`148`	`+`
`143`	`149`	`static GOptionEntry add_options[] =`
`144`	`150`	`{`
`145`	`151`	`{ "output-dir", 'o', 0, G_OPTION_ARG_STRING, &persist_state_dir, "The directory where persist file is located.", "<directory>" },`