Move variables declarations from header to source

This prevents 'multiple definition' error when building with -fno-common this is
used in Address Sanitizer builds.

Change-Id: I0004622648c6e442bfed36f7aa14405b858d995b
Signed-off-by: Slava Barinov <v.barinov@samsung.com>

diff --git a/src/sdb.c b/src/sdb.c
index 4c3009f..c31020b 100644 (file)
--- a/src/sdb.c
+++ b/src/sdb.c
@@ -71,6 +71,9 @@ uid_t g_sdk_user_id;
 gid_t g_sdk_group_id;
 char* g_sdk_home_dir = NULL;
 char* g_sdk_home_dir_env = NULL;
+pcap g_capabilities;
+int rootshell_mode; // 0: sdk user, 1: root
+int booting_done; // 0: platform booting is in progess 1: platform booting is done
 
 struct group_info
 {

diff --git a/src/sdb.h b/src/sdb.h
index 7e3d1f1..a521466 100644 (file)
--- a/src/sdb.h
+++ b/src/sdb.h
@@ -268,7 +268,7 @@ typedef struct platform_capabilities
     char sdbd_version[CAPBUF_ITEMSIZE];         // sdbd version
     char sdbd_plugin_version[CAPBUF_ITEMSIZE];  // sdbd plugin version
 } pcap;
-pcap g_capabilities;
+extern pcap g_capabilities;
 
 #define SDBD_PLUGIN_PATH    "/usr/lib/libsdbd_plugin.so"
 #define SDBD_PLUGIN_INTF    "sdbd_plugin_cmd_proc"
@@ -376,8 +376,8 @@ void log_service(int fd, void *cookie);
 void remount_service(int fd, void *cookie);
 char * get_log_file_path(const char * log_name);
 
-int rootshell_mode; // 0: sdk user, 1: root
-int booting_done; // 0: platform booting is in progess 1: platform booting is done
+extern int rootshell_mode; // 0: sdk user, 1: root
+extern int booting_done; // 0: platform booting is in progess 1: platform booting is done
 
 // This is the users and groups config for the platform