Making variables to static

Change-Id: I578014b01c3d50502aeca8aceb043d07c5d8c4d8

diff --git a/client/src/muse_client.c b/client/src/muse_client.c
index 42e284d..6f5d89b 100644 (file)
--- a/client/src/muse_client.c
+++ b/client/src/muse_client.c
@@ -35,11 +35,11 @@ const char *UDS_files[MUSE_CHANNEL_MAX] = {MUSE_SOCK_FILE0, MUSE_SOCK_FILE1};
 
 #ifdef MUSE_USE_CLIENT_SIGHANDLER
 /* signal handler */
-struct sigaction mc_int_old_action;
-struct sigaction mc_abrt_old_action;
-struct sigaction mc_segv_old_action;
-struct sigaction mc_term_old_action;
-struct sigaction mc_sys_old_action;
+static struct sigaction mc_int_old_action;
+static struct sigaction mc_abrt_old_action;
+static struct sigaction mc_segv_old_action;
+static struct sigaction mc_term_old_action;
+static struct sigaction mc_sys_old_action;
 
 static gboolean _mc_table_remove_func(gpointer key, gpointer value, gpointer user_data);
 static void _mc_sigaction(int signo, siginfo_t *siginfo, void *context);

diff --git a/core/src/muse_core.c b/core/src/muse_core.c
index 2b19bd8..1d1f7bb 100644 (file)
--- a/core/src/muse_core.c
+++ b/core/src/muse_core.c
@@ -30,7 +30,7 @@
 #define MUSE_WATCHDOG_CHECK_COUNT                      3
 #define MUSE_WATCHDOG_TIMER_PERIOD                     5
 
-const char *msg_type[] = { "normal type", "fds type" };
+static const char *msg_type[] = { "normal type", "fds type" };
 
 static GMutex msg_lock;
 static GMutex msg_ipc_lock;

diff --git a/packaging/mused.spec b/packaging/mused.spec
index b649266..8ac7b66 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.3.98
+Version:    0.3.99
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/server/src/muse_server_signal.c b/server/src/muse_server_signal.c
index 7b72db9..fac02a4 100644 (file)
--- a/server/src/muse_server_signal.c
+++ b/server/src/muse_server_signal.c
@@ -23,12 +23,12 @@
 #include <execinfo.h>
 #include <dlfcn.h>
 
-struct sigaction ms_segv_old_action;
-struct sigaction ms_abrt_old_action;
-struct sigaction ms_term_old_action;
-struct sigaction ms_bus_old_action;
-struct sigaction ms_xcpu_old_action;
-struct sigaction ms_pipe_old_action;
+static struct sigaction ms_segv_old_action;
+static struct sigaction ms_abrt_old_action;
+static struct sigaction ms_term_old_action;
+static struct sigaction ms_bus_old_action;
+static struct sigaction ms_xcpu_old_action;
+static struct sigaction ms_pipe_old_action;
 
 static GMutex signal_lock;
 

diff --git a/server/src/muse_server_tool.c b/server/src/muse_server_tool.c
index f6a14ba..fcc1237 100644 (file)
--- a/server/src/muse_server_tool.c
+++ b/server/src/muse_server_tool.c
@@ -22,9 +22,8 @@
 #include "muse_server_tool.h"
 #include <fts.h>
 
-int ms_tool_optind = 1;
-int ms_tool_optopt;
-char *ms_tool_optarg;
+static int ms_tool_optind = 1;
+static char *ms_tool_optarg;
 
 static const char *pid_file = NULL;
 static const char *out_file = NULL;
@@ -48,7 +47,7 @@ static int _ms_tool_getopt(int argc, char **argv, const char *opts)
                if (ms_tool_optind >= argc || argv[ms_tool_optind][0] != '-' || argv[ms_tool_optind][1] == '\0')
                        return(EOF);
        }
-       ms_tool_optopt = ri = argv[ms_tool_optind][si];
+       ri = argv[ms_tool_optind][si];
        if (ri == ':' || !(cp = strchr(opts, ri))) {
                if (argv[ms_tool_optind][++si] == '\0') {
                        ms_tool_optind++;