etc. : Removed sonar violations.

Some modules are modified to remove sonar violations such as goto and if-else statement.

Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index f0d2c80588a7ed3a68a7d03836da36a1a41fb299..1ec568a4f0276eed7e50c753fe4a2b73494211e1 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -88,10 +88,10 @@ int tizen_base_port;
 char tizen_target_path[MAXLEN];
 char logpath[MAXLEN];
 
-static int skin_argc;
-static char **skin_argv;
-static int qemu_argc;
-static char **qemu_argv;
+static int _skin_argc;
+static char **_skin_argv;
+static int _qemu_argc;
+static char **_qemu_argv;
 
 #ifdef CONFIG_DARWIN
 int thread_running = 1; /* Check if we need exit main */
@@ -544,7 +544,7 @@ void prepare_maru(void)
 
     INFO("call construct_main_window\n");
 
-    construct_main_window(skin_argc, skin_argv, qemu_argc, qemu_argv);
+    construct_main_window(_skin_argc, _skin_argv, _qemu_argc, _qemu_argv);
 
     int guest_server_port = tizen_base_port + SDB_UDP_SENSOR_INDEX;
     start_guest_server(guest_server_port);
@@ -582,15 +582,15 @@ void* main_thread(void* args)
     int argc = g_argc;
 
     argv = (char**) args;
-    parse_options(argc, argv, &skin_argc, &skin_argv, &qemu_argc, &qemu_argv);
-    get_bin_dir(qemu_argv[0]);
+    parse_options(argc, argv, &_skin_argc, &_skin_argv, &_qemu_argc, &_qemu_argv);
+    get_bin_dir(_qemu_argv[0]);
     socket_init();
-    extract_qemu_info(qemu_argc, qemu_argv);
+    extract_qemu_info(_qemu_argc, _qemu_argv);
 
     INFO("Emulator start !!!\n");
     atexit(maru_atexit);
 
-    extract_skin_info(skin_argc, skin_argv);
+    extract_skin_info(_skin_argc, _skin_argv);
 
     check_shdmem();
     make_shdmem();
@@ -605,21 +605,21 @@ void* main_thread(void* args)
     int i;
 
     fprintf(stdout, "qemu args : =========================================\n");
-    for (i = 0; i < qemu_argc; ++i) {
-        fprintf(stdout, "%s ", qemu_argv[i]);
+    for (i = 0; i < _qemu_argc; ++i) {
+        fprintf(stdout, "%s ", _qemu_argv[i]);
     }
     fprintf(stdout, "\n");
     fprintf(stdout, "=====================================================\n");
 
     fprintf(stdout, "skin args : =========================================\n");
-    for (i = 0; i < skin_argc; ++i) {
-        fprintf(stdout, "%s ", skin_argv[i]);
+    for (i = 0; i < _skin_argc; ++i) {
+        fprintf(stdout, "%s ", _skin_argv[i]);
     }
     fprintf(stdout, "\n");
     fprintf(stdout, "=====================================================\n");
 
     INFO("qemu main start!\n");
-    qemu_main(qemu_argc, qemu_argv, NULL);
+    qemu_main(_qemu_argc, _qemu_argv, NULL);
 
     exit_emulator();
     thread_running = 0;
@@ -630,15 +630,15 @@ void* main_thread(void* args)
 #else
 int main(int argc, char *argv[])
 {
-    parse_options(argc, argv, &skin_argc, &skin_argv, &qemu_argc, &qemu_argv);
-    get_bin_dir(qemu_argv[0]);
+    parse_options(argc, argv, &_skin_argc, &_skin_argv, &_qemu_argc, &_qemu_argv);
+    get_bin_dir(_qemu_argv[0]);
     socket_init();
-    extract_qemu_info(qemu_argc, qemu_argv);
+    extract_qemu_info(_qemu_argc, _qemu_argv);
 
     INFO("Emulator start !!!\n");
     atexit(maru_atexit);
 
-    extract_skin_info(skin_argc, skin_argv);
+    extract_skin_info(_skin_argc, _skin_argv);
 
     check_shdmem();
     make_shdmem();
@@ -653,21 +653,21 @@ int main(int argc, char *argv[])
     int i;
 
     fprintf(stdout, "qemu args : =========================================\n");
-    for (i = 0; i < qemu_argc; ++i) {
-        fprintf(stdout, "%s ", qemu_argv[i]);
+    for (i = 0; i < _qemu_argc; ++i) {
+        fprintf(stdout, "%s ", _qemu_argv[i]);
     }
     fprintf(stdout, "\n");
     fprintf(stdout, "=====================================================\n");
 
     fprintf(stdout, "skin args : =========================================\n");
-    for (i = 0; i < skin_argc; ++i) {
-        fprintf(stdout, "%s ", skin_argv[i]);
+    for (i = 0; i < _skin_argc; ++i) {
+        fprintf(stdout, "%s ", _skin_argv[i]);
     }
     fprintf(stdout, "\n");
     fprintf(stdout, "=====================================================\n");
 
     INFO("qemu main start!\n");
-    qemu_main(qemu_argc, qemu_argv, NULL);
+    qemu_main(_qemu_argc, _qemu_argv, NULL);
 
     exit_emulator();
 

diff --git a/tizen/src/guest_server.c b/tizen/src/guest_server.c
index d2030afb2ff2de736ba0ab0f9d76a10ca1beeb13..c7c51e45a205d5554296d6984b9d34e3200edd40 100644 (file)
--- a/tizen/src/guest_server.c
+++ b/tizen/src/guest_server.c
@@ -127,9 +127,19 @@ static void* run_guest_server(void* args)
     port = svr_port;
 
     if ((server_sock = socket(PF_INET, SOCK_DGRAM, 0)) < 0) {
-        ERR( "create listen socket error\n" );
-        perror( "create listen socket error\n" );
-        goto cleanup;
+        ERR("create listen socket error\n");
+        perror("create listen socket error\n");
+#ifdef _WIN32
+        if (server_sock) {
+            closesocket(server_sock);
+        }
+#else
+        if (server_sock) {
+            close(server_sock);
+        }
+#endif
+        server_sock = 0;
+        return NULL;
     }
 
     memset(&server_addr, '\0', sizeof(server_addr));
@@ -143,7 +153,17 @@ static void* run_guest_server(void* args)
     if ( 0 > bind( server_sock, (struct sockaddr*) &server_addr, sizeof( server_addr ) ) ) {
         ERR( "guest server bind error: " );
         perror( "bind" );
-        goto cleanup;
+#ifdef _WIN32
+        if (server_sock) {
+            closesocket(server_sock);
+        }
+#else
+        if (server_sock) {
+            close(server_sock);
+        }
+#endif
+        server_sock = 0;
+        return NULL;
     } else {
         INFO( "success to bind port[127.0.0.1:%d/udp] for guest_server in host \n", port );
     }
@@ -231,8 +251,9 @@ static void* run_guest_server(void* args)
         }
     }
 
+#if 0
 cleanup:
-
+#endif
 #ifdef _WIN32
     if (server_sock) {
         closesocket(server_sock);
@@ -242,9 +263,7 @@ cleanup:
         close(server_sock);
     }
 #endif
-
     server_sock = 0;
-
     return NULL;
 }
 

diff --git a/tizen/src/mloop_event.c b/tizen/src/mloop_event.c
index 5069fba2c59924fa4261cf6400a9abfa1aa843c1..b87a802fa24b59a13e16abec37dd2385aa69da0c 100644 (file)
--- a/tizen/src/mloop_event.c
+++ b/tizen/src/mloop_event.c
@@ -119,7 +119,14 @@ static int mloop_evsock_create(struct mloop_evsock *ev)
     ret = bind(ev->sockno, &sa, sa_size);
     if (ret) {
         ERR("bind() failed\n");
-        goto mloop_evsock_init_cleanup;
+#ifdef _WIN32
+        closesocket(ev->sockno);
+#else
+        close(ev->sockno);
+#endif
+        ev->sockno = -1;
+        ev->status = 0;
+        return ret;
     }
 
     if (ev->portno == 0) {
@@ -131,21 +138,18 @@ static int mloop_evsock_create(struct mloop_evsock *ev)
     ret = connect(ev->sockno, (struct sockaddr *) &sa, sa_size);
     if (ret) {
         ERR("connect() failed\n");
-        goto mloop_evsock_init_cleanup;
+#ifdef _WIN32
+        closesocket(ev->sockno);
+#else
+        close(ev->sockno);
+#endif
+        ev->sockno = -1;
+        ev->status = 0;
+        return ret;
     }
 
     ev->status = MLOOP_EVSOCK_CONNECTED;
     return 0;
-
-mloop_evsock_init_cleanup:
-#ifdef _WIN32
-    closesocket(ev->sockno);
-#else
-    close(ev->sockno);
-#endif
-    ev->sockno = -1;
-    ev->status = 0;
-    return ret;
 }
 
 static void mloop_evsock_remove(struct mloop_evsock *ev)
@@ -505,8 +509,9 @@ void mloop_evcmd_lower_intr(void *irq)
 void mloop_evcmd_usbkbd(int on)
 {
     struct mloop_evpack pack = { htons(MLOOP_EVTYPE_USB_ADD), htons(13), "keyboard" };
-    if (on == 0)
+    if (on == 0) {
         pack.type = htons(MLOOP_EVTYPE_USB_DEL);
+    }
     mloop_evsock_send(&mloop, &pack);
 }
 
@@ -527,6 +532,8 @@ void mloop_evcmd_usbdisk(char *img)
     if (img) {
         if (strlen(img) > PACKET_LEN-5) {
             // Need log
+            ERR("The length of disk image path is greater than "
+                "lenth of maximum packet.\n");
             return;
         }
 
@@ -569,7 +576,6 @@ void mloop_evcmd_hwkey(int event_type, int keycode)
 
     memcpy(pack.data, &event_type, sizeof(int));
     memcpy(pack.data + sizeof(int), &keycode, sizeof(int));
-    //pack.data = htons(pack.data);
 
     mloop_evsock_send(&mloop, &pack);
 }

diff --git a/tizen/src/option.c b/tizen/src/option.c
index a35f6e94c5db156bb60916dd7a0edc8e5e3ab60b..aa21e1c8f1605446709b3f99e4f5069000c71333 100644 (file)
--- a/tizen/src/option.c
+++ b/tizen/src/option.c
@@ -64,7 +64,6 @@ CFDictionaryRef proxySettings;
 #define SOCKS_PROTOCOL "socks="
 #define DIRECT "DIRECT"
 #define PROXY "PROXY"
-//DEFAULT_DEBUG_CHANNEL(tizen);
 MULTI_DEBUG_CHANNEL(tizen, option);
 #if defined(CONFIG_WIN32)
 BYTE *url;
@@ -231,7 +230,6 @@ static void getmacproxy(char *http_proxy, char *https_proxy, char *ftp_proxy, ch
         sprintf(http_proxy, "%s:%d", hostname, port);
 
         free(hostname);
-        //CFRelease(proxySettings);
     } else {
         INFO("http proxy is null\n");
     }
@@ -248,7 +246,6 @@ static void getmacproxy(char *http_proxy, char *https_proxy, char *ftp_proxy, ch
         sprintf(https_proxy, "%s:%d", hostname, port);
 
         free(hostname);
-        //CFRelease(proxySettings);
     } else {
         INFO("https proxy is null\n");
     }
@@ -265,7 +262,6 @@ static void getmacproxy(char *http_proxy, char *https_proxy, char *ftp_proxy, ch
         sprintf(ftp_proxy, "%s:%d", hostname, port);
 
         free(hostname);
-        //CFRelease(proxySettings);
     } else {
         INFO("ftp proxy is null\n");
     }
@@ -451,7 +447,6 @@ int gethostproxy(char *http_proxy, char *https_proxy, char *ftp_proxy, char *soc
 
     output = popen("gconftool-2 --get /system/proxy/mode", "r");
     fscanf(output, "%s", buf);
-    // strcpy(url, buf);
     pclose(output);
 
     //priority : auto > manual > none