auxd: fix SVACE issue 88/198988/3 accepted/tizen/unified/20190211.060126 submit/tizen/20190205.121525
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Thu, 31 Jan 2019 12:06:18 +0000 (15:06 +0300)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Mon, 4 Feb 2019 17:22:16 +0000 (20:22 +0300)
- Use global variable instead of local one via global pointer.

Change-Id: Ie544ababc098d14ebc82191236aea59d3c12b6cd
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>
src/auxd/src/main.cpp

index 63b2c4ce449c7231bd87466d81931728d434260a..23095d637ac532bc8e699578f6e9c13c2173ba67 100644 (file)
@@ -145,13 +145,13 @@ static EventLoop::Handler recv_handler[AUXD::ID_CNT] = {
 };
 
 
-static EventLoop *g_loop;
+static EventLoop g_loop;
 
 static void signal_handler(int sig)
 {
     if (sig == SIGTERM) {
         // shut down
-        g_loop->stop();
+        g_loop.stop();
 
         // reaset signal
         signal(SIGTERM, SIG_DFL);
@@ -160,10 +160,8 @@ static void signal_handler(int sig)
     }
 }
 
-static void signals_setup(EventLoop *loop)
+static void signals_setup()
 {
-    g_loop = loop;
-
     signal(SIGTERM, signal_handler);
     signal(SIGHUP, signal_handler);
 }
@@ -172,25 +170,21 @@ static void signals_reset()
 {
     signal(SIGHUP, SIG_DFL);
     signal(SIGINT, SIG_DFL);
-
-    g_loop = nullptr;
 }
 
 
 static void do_main()
 {
-    EventLoop::RecvData recv_data(nullptr, recv_handler, AUXD::ID_CNT);
-    EventLoop event_loop;
-
-    signals_setup(&event_loop);
-    event_loop.init(SOCKET_PATH);
+    g_loop.init(SOCKET_PATH);
+    signals_setup();
 
     sd_notify(0, "READY=1");
-    event_loop.run(recv_data, CONNECT_TIMEOUT);
+    EventLoop::RecvData recv_data(nullptr, recv_handler, AUXD::ID_CNT);
+    g_loop.run(recv_data, CONNECT_TIMEOUT);
     sd_notify(0, "STOPPING=1");
 
-    event_loop.uninit();
     signals_reset();
+    g_loop.uninit();
 }