Fix for function coverage test

fix for function coverage test

Change-Id: Ie7419d5ba0c2dfadf4f1b3e26cdf300b92764bc6
Signed-off-by: greatim <jaewon81.lim@samsung.com>

diff --git a/Makefile b/Makefile
index 60189259daedfae6b9ab1a8ffce87b9d0b1e5547..2f685487abc137053df430d7e4d3bd81090a6f20 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ ifeq ($(HOST_OS),linux)
 endif
 
 ifeq ($(HOST_OS),darwin)
-       LOCAL_USB_SRC := src/usb_darwin.c
+       LOCAL_USB_SRC := src/usb_darwin.c src/device_vendors.c
        LOCAL_UTIL_SRC := src/utils_unix.c
        LOCAL_OTHER_SRC := src/fdevent.c src/fdevent_unix.c src/auto_complete.c
        LOCAL_LFLAGS := -stdlib=libstdc++ -lpthread -lcrypto -framework CoreFoundation -framework IOKit -framework Carbon
@@ -59,7 +59,6 @@ SDB_SRC_CFILES := \
        src/sockets.c \
        src/file_sync_client.c \
        $(LOCAL_USB_SRC) \
-       src/device_vendors.c \
        $(LOCAL_UTIL_SRC) \
        $(LOCAL_OTHER_SRC) \
        src/utils.c \
@@ -121,5 +120,7 @@ clean :
        $(MAKE) -C $(ENCLIB_BUILD_PATH) clean
        rm -rf src/*.o
        rm -rf $(BINDIR)
-
+       rm -rf src/*.gcda
+       rm -rf src/*.gcno
+       rm -rf src/*.gcov
        

diff --git a/src/adb_auth_host.c b/src/adb_auth_host.c
index 630866ce2c20f50ece99e1d7d18a7bcf15f9b8a9..3dc7a5c7e1c0e77966c07766b4c71f09c8701317 100644 (file)
--- a/src/adb_auth_host.c
+++ b/src/adb_auth_host.c
@@ -30,6 +30,7 @@
 #include "sysdeps.h"
 #include "sdb.h"
 #include "adb_auth.h"
+#include "utils.h"
 
 /* HACK: we need the RSAPublicKey struct
  * but RSA_verify conflits with openssl */
@@ -417,12 +418,14 @@ int adb_auth_get_userkey(unsigned char *data, size_t len) {
 
        if (len < (size_t) (ret + 1)) {
                D("%s: Content too large ret=%d\n", path, ret);
+        SAFE_FREE(file);
                return 0;
        }
 
        memcpy(data, file, ret);
        data[ret] = '\0';
 
+    SAFE_FREE(file);
        return ret + 1;
 }
 

diff --git a/src/auto_complete.c b/src/auto_complete.c
index e2c8990d0102102571600bfaec7371a406564902..b614762fb9b17aab09f947265600b701df6eaa87 100644 (file)
--- a/src/auto_complete.c
+++ b/src/auto_complete.c
@@ -333,10 +333,10 @@ static int parse_uninstall(int argc, char** argv) {
     if(argc == 0) {
         char full_cmd[255];
         if(COMPLETE_FLAG) {
-            snprintf(full_cmd, sizeof full_cmd, "shell:/usr/bin/pkgcmd -l | grep -E '\\[tpk\\]|\\[wgt\\]' | awk '{print $4}'");
+            snprintf(full_cmd, sizeof full_cmd, "shell:/usr/bin/pkgcmd -l | grep -E '\\[tpk\\]|\\[wgt\\]' | awk '{print $6}'");
         }
         else {
-            snprintf(full_cmd, sizeof full_cmd, "shell:/usr/bin/pkgcmd -l | grep -E '\\[tpk\\]|\\[wgt\\]' | awk '{print $4}' | grep '^\\[%s'", argv[0]);
+            snprintf(full_cmd, sizeof full_cmd, "shell:/usr/bin/pkgcmd -l | grep -E '\\[tpk\\]|\\[wgt\\]' | awk '{print $6}' | grep '^\\[%s'", argv[0]);
         }
 
         int result = sdb_connect(full_cmd);

diff --git a/src/command_function.c b/src/command_function.c
index c1dd35705aed4a575b7c4f22e9f342652efb40cd..e14d8b9da530db768db00db00ea406ad1109148f 100644 (file)
--- a/src/command_function.c
+++ b/src/command_function.c
@@ -353,6 +353,8 @@ int __connect(int argc, char ** argv) {
     return 1;
 }
 
+// currently not supported
+#if 0
 int device_con(int argc, char ** argv) {
 
     char *tmp;
@@ -369,6 +371,7 @@ int device_con(int argc, char ** argv) {
 
     return 1;
 }
+#endif
 
 int get_state_serialno(int argc, char ** argv) {
 
@@ -398,6 +401,7 @@ int root(int argc, char ** argv) {
     return 1;
 }
 
+//LCOV_EXCL_START
 int status_window(int argc, char ** argv) {
 
     char full_cmd[PATH_MAX];
@@ -450,6 +454,7 @@ int status_window(int argc, char ** argv) {
 
     return 0;
 }
+//LCOV_EXCL_STOP
 
 int kill_server(int argc, char ** argv) {
     int fd;
@@ -933,6 +938,7 @@ static int get_pkgtype_file_name(const char* file_name) {
  * kill gdbserver if running
  */
 
+//LCOV_EXCL_START
 static int kill_gdbserver_if_running(const char* process_cmd) {
     char cmd[512] = {};
     char buf[512] = {};
@@ -962,6 +968,7 @@ static int kill_gdbserver_if_running(const char* process_cmd) {
     sdb_close(result);
     return 1;
 }
+//LCOV_EXCL_STOP
 
 static void __inline__ format_host_command(char* buffer, size_t  buflen, const char* command, transport_type ttype, const char* serial)
 {
@@ -974,6 +981,7 @@ static void __inline__ format_host_command(char* buffer, size_t  buflen, const c
 /*
  * returns -1 if gdbserver exists
  */
+//LCOV_EXCL_START
 static int verify_gdbserver_exist() {
     char cmd[512] = {};
     char buf[512] = {};
@@ -993,6 +1001,7 @@ static int verify_gdbserver_exist() {
     sdb_close(result);
     return result;
 }
+//LCOV_EXCL_STOP
 
 int get_boot(int argc, char ** argv) {
     char full_cmd[20];

diff --git a/src/commandline.c b/src/commandline.c
index 51eb3eec5b19b08bb64033812a5056f3bcd09c24..798455386bd92a6714d26e61b06324bd6fea9830 100755 (executable)
--- a/src/commandline.c
+++ b/src/commandline.c
@@ -76,6 +76,7 @@ int get_platform_version(struct sdb_version *pversion) {
 
     fd = sdb_connect(GET_SYSTEM_INFO_CMD);
     if(fd < 0) {
+        D("sysinfo get failed\n");
         return -1;
     }
 
@@ -83,11 +84,19 @@ int get_platform_version(struct sdb_version *pversion) {
         int major = 0;
         int minor = 0;
         int patch = 0;
-        if (sscanf(pinfo.platform_version, "%d.%d.%d", &major, &minor, &patch) == 3) {
+
+        D("Returned platform version %s\n", pinfo.platform_version);
+        ret = sscanf(pinfo.platform_version, "%d.%d.%d", &major, &minor, &patch);
+        if (ret == 3) {
             pversion->major = major;
             pversion->minor = minor;
             pversion->patch = patch;
             ret = 0;
+        } else if (ret == 2) {
+            pversion->major = major;
+            pversion->minor = minor;
+            pversion->patch = 0;
+            ret = 0;
         }
     }
     D("Platform version : %d.%d.%d\n", pversion->major, pversion->minor, pversion->patch);
@@ -606,6 +615,8 @@ int __sdb_command(const char* cmd) {
     return 0;
 }
 
+// not used currently
+#if 0
 const char* get_basename(const char* filename)
 {
     const char* basename = sdb_dirstop(filename);
@@ -616,6 +627,7 @@ const char* get_basename(const char* filename)
         return filename;
     }
 }
+#endif
 
 static void create_opt_list(LIST_NODE** opt_list) {
 
@@ -775,21 +787,23 @@ static void create_cmd_list(LIST_NODE** cmd_list) {
             0, EMPTY_STRING, forkserver, COMMANDLINE_FORKSERVER_MAX_ARG, COMMANDLINE_FORKSERVER_MIN_ARG);
     prepend(cmd_list, forkserver_cmd);
 
+    // deprecated
     COMMAND* oprofile_cmd = NULL;
     create_command(&oprofile_cmd, COMMANDLINE_OPROFILE_NAME, NULL,
             0, EMPTY_STRING, oprofile, COMMANDLINE_OPROFILE_MAX_ARG, COMMANDLINE_OPROFILE_MIN_ARG);
     prepend(cmd_list, oprofile_cmd);
 
-    COMMAND* profile_cmd = NULL;
-    create_command(&profile_cmd, COMMANDLINE_PROFILE_NAME, NULL,
-            0, EMPTY_STRING, profile, COMMANDLINE_PROFILE_MAX_ARG, COMMANDLINE_PROFILE_MIN_ARG);
-    prepend(cmd_list, profile_cmd);
-
+    // deprecated
     COMMAND* da_cmd = NULL;
     create_command(&da_cmd , COMMANDLINE_DA_NAME, NULL,
             0, EMPTY_STRING, da, COMMANDLINE_DA_MAX_ARG, COMMANDLINE_DA_MIN_ARG);
     prepend(cmd_list, da_cmd );
 
+    COMMAND* profile_cmd = NULL;
+    create_command(&profile_cmd, COMMANDLINE_PROFILE_NAME, NULL,
+            0, EMPTY_STRING, profile, COMMANDLINE_PROFILE_MAX_ARG, COMMANDLINE_PROFILE_MIN_ARG);
+    prepend(cmd_list, profile_cmd);
+
     COMMAND* capability_cmd = NULL;
     create_command(&capability_cmd, COMMANDLINE_CAPABILITY_NAME, NULL,
             0, EMPTY_STRING, get_capability, COMMANDLINE_CAPABILITY_MAX_ARG, COMMANDLINE_CAPABILITY_MIN_ARG);

diff --git a/src/memutils.c b/src/memutils.c
index 4fdd686c5a93799ef2802fc1c11a27d7ac2956d2..6affe98d8f32ea0160ce631505400d43b6c15243 100644 (file)
--- a/src/memutils.c
+++ b/src/memutils.c
@@ -39,6 +39,7 @@ void *s_malloc(size_t size) {
     return ptr + sizeof(size_t);
 }
 
+//LCOV_EXCL_START
 void *s_realloc(void *ptr, size_t new_size) {
     void *new_ptr;
     size_t org_size;
@@ -59,6 +60,7 @@ void *s_realloc(void *ptr, size_t new_size) {
 
     return new_ptr + sizeof(size_t);
 }
+//LCOV_EXCL_STOP
 
 void s_free(void *ptr) {
     size_t size;

diff --git a/src/sdb_map.c b/src/sdb_map.c
index 2651c6a97ed05109ac4e69d0eabc093242046edc..71103d118d3713dfd36db4e039ee0bf66d407ae7 100644 (file)
--- a/src/sdb_map.c
+++ b/src/sdb_map.c
@@ -68,6 +68,7 @@ void initialize_map(MAP* this, int size, int(*hash)(struct map* this, MAP_KEY ke
     this->map_node_list = (LIST_NODE**)calloc(this->size, sizeof(LIST_NODE*));
 }
 
+//LCOV_EXCL_START
 static void default_free(void* node) {
     MAP_NODE* _node = node;
     if(_node != NULL) {
@@ -77,6 +78,7 @@ static void default_free(void* node) {
         SAFE_FREE(_node);
     }
 }
+//LCOV_EXCL_STOP
 
 static int default_hash(MAP* this, MAP_KEY key) {
     return key.key_int%(this->size);
@@ -142,6 +144,7 @@ void map_remove(MAP* this, MAP_KEY key) {
     remove_node(hash_list, result_node, this->freedata);
 }
 
+//LCOV_EXCL_START
 void map_clear(MAP* this) {
 
     if(this != NULL) {
@@ -153,3 +156,4 @@ void map_clear(MAP* this) {
         SAFE_FREE(this->map_node_list);
     }
 }
+//LCOV_EXCL_STOP

diff --git a/src/sockets.c b/src/sockets.c
index ea1ca719c9b746b961f445a21ac4c9175e6bd706..d2b3d3cd6c4c5cb51beb5a971dc10800503004bf 100755 (executable)
--- a/src/sockets.c
+++ b/src/sockets.c
@@ -144,11 +144,13 @@ SDB_SOCKET *find_local_socket(unsigned id)
     return result;
 }
 
+//LCOV_EXCL_START
 static void remove_socket(void* s)
 {
     SDB_SOCKET* socket = s;
     socket->node = NULL;
 }
+//LCOV_EXCL_STOP
 
 int local_socket_enqueue(SDB_SOCKET *s, PACKET *p)
 {

diff --git a/src/strutils.c b/src/strutils.c
index 96ac0120c33bb1064ea7b7f7b6ae539a7cd336c5..0d8442b2cc2ee4dc34d21e463c203b4cf15beabe 100755 (executable)
--- a/src/strutils.c
+++ b/src/strutils.c
@@ -129,6 +129,7 @@ char* strlchr(const char*s, int chr) {
     return NULL;
 }
 
+//LCOV_EXCL_START
 char* trim(char *s) {
     rtrim(s);
     return ltrim(s);
@@ -163,3 +164,4 @@ char* ltrim(char *s) {
 
     return s;
 }
+//LCOV_EXCL_STOP

diff --git a/src/transport.c b/src/transport.c
index 4e0b6ca24ec080347b7e3c79d1f4517d8744617e..b615dbd2e2a9364ae15b2c6e03e9aa80a40cf4e0 100755 (executable)
--- a/src/transport.c
+++ b/src/transport.c
@@ -411,6 +411,7 @@ void send_cmd(unsigned arg0, unsigned arg1, unsigned cmd, char* data, TRANSPORT*
     put_apacket(p);
 }
 
+//LCOV_EXCL_START
 #ifdef SUPPORT_ENCRYPT
 /*
 desc. : 암호화 모드 변경 실패 시, sdbd에게 실패 메시지 전송
@@ -430,6 +431,7 @@ void send_encr_fail(SDB_SOCKET* sock, TRANSPORT* t, unsigned failed_value)
        put_apacket(p);
 }
 #endif
+//LCOV_EXCL_STOP
 
 static void *transport_thread(void *_t)
 {
@@ -734,11 +736,11 @@ int list_forwarding(char* buf, size_t bufsize) {
     return p - buf;
 }
 
+//TODO REMOTE_DEVICE_CONNECT complete device connect after resolving security issue
+#if 0
 int register_device_con_transport(int s, const char *serial) {
 
-    //TODO REMOTE_DEVICE_CONNECT complete device connect after resolving security issue
-#if 0
-    if(current_local_transports >= SDB_LOCAL_TRANSPORT_MAX) {
+   if(current_local_transports >= SDB_LOCAL_TRANSPORT_MAX) {
         LOG_ERROR("Too many tcp connection\n");
         return -1;
     }
@@ -768,9 +770,8 @@ int register_device_con_transport(int s, const char *serial) {
     ++current_local_transports;
     register_transport(t);
     return 0;
-#endif
-    return -1;
 }
+#endif
 
 #undef TRACE_TAG
 #define TRACE_TAG  TRACE_RWX
@@ -992,6 +993,7 @@ void wakeup_select_func(int _fd, unsigned ev, void *data) {
                 send_auth_publickey(t);
                 LOG_DEBUG("send auth ok !!");
             }
+#if 0 // daemon code (never happened in sdb server)
         } else if (p->msg.arg0 == ADB_AUTH_SIGNATURE) {
             if (adb_auth_verify(t->token, p->data, p->msg.data_length)) {
                 adb_auth_verified(t);
@@ -1003,6 +1005,7 @@ void wakeup_select_func(int _fd, unsigned ev, void *data) {
             }
         } else if (p->msg.arg0 == ADB_AUTH_RSAPUBLICKEY) {
             adb_auth_confirm_key(p->data, p->msg.data_length, t);
+#endif
         }
    }
 #ifdef SUPPORT_ENCRYPT
@@ -1171,27 +1174,6 @@ void put_apacket(void *p)
     SAFE_FREE(packet);
 }
 
-void send_auth_request(atransport *t)
-{
-    D("Calling send_auth_request\n");
-    apacket *p;
-    int ret;
-
-    ret = adb_auth_generate_token(t->token, sizeof(t->token));
-    if (ret != sizeof(t->token)) {
-        D("Error generating token ret=%d\n", ret);
-        return;
-    }
-
-    p = get_apacket();
-    memcpy(p->data, t->token, ret);
-    p->msg.command = A_AUTH;
-    p->msg.arg0 = ADB_AUTH_TOKEN;
-    p->msg.data_length = ret;
-    send_packet(p, t);
-    put_apacket(p);
-}
-
 void send_auth_response(uint8_t *token, size_t token_size, atransport *t)
 {
     D("Calling send_auth_response\n");
@@ -1232,6 +1214,28 @@ void send_auth_publickey(atransport *t)
     put_apacket(p);
 }
 
+#if 0 // daemon code (never used in sdb server)
+void send_auth_request(atransport *t)
+{
+    D("Calling send_auth_request\n");
+    apacket *p;
+    int ret;
+
+    ret = adb_auth_generate_token(t->token, sizeof(t->token));
+    if (ret != sizeof(t->token)) {
+        D("Error generating token ret=%d\n", ret);
+        return;
+    }
+
+    p = get_apacket();
+    memcpy(p->data, t->token, ret);
+    p->msg.command = A_AUTH;
+    p->msg.arg0 = ADB_AUTH_TOKEN;
+    p->msg.data_length = ret;
+    send_packet(p, t);
+    put_apacket(p);
+}
+
 void adb_auth_verified(atransport *t)
 {
     handle_online(t);
@@ -1249,3 +1253,5 @@ void handle_offline(atransport *t)
     //Close the associated usb
     t->online = 0;
 }
+
+#endif

diff --git a/src/utils.c b/src/utils.c
index 30bd40273f056c31c415fbf97ef674d4bc95caab..536e80847305a6e1725e834b9421899510594fa8 100755 (executable)
--- a/src/utils.c
+++ b/src/utils.c
@@ -88,6 +88,7 @@ int mkdirs(char *name)
     return 1;
 }
 
+//LCOV_EXCL_START
 void append_separator(char* result_path, char* path) {
 
     int path_len = strlen(path);
@@ -98,6 +99,7 @@ void append_separator(char* result_path, char* path) {
         snprintf(result_path, PATH_MAX, "%s",path);
     }
 }
+//LCOV_EXCL_STOP
 
 void append_file(char* result_path, char* dir, char* append_dir, int length) {
     char* tmp_append;
@@ -325,6 +327,7 @@ int sdb_mutex_unlock(sdb_mutex_t *mutex, char *name) {
     return utils_backend->sdb_mutex_unlock(mutex);
 }
 
+//LCOV_EXCL_START
 int sdb_cond_init(sdb_cond_t *cond, const void *unused) {
     return utils_backend->sdb_cond_init(cond, unused);
 }
@@ -336,6 +339,7 @@ int sdb_cond_wait(sdb_cond_t *cond, sdb_mutex_t *mutex) {
 int sdb_cond_broadcast(sdb_cond_t *cond) {
     return utils_backend->sdb_cond_broadcast(cond);
 }
+//LCOV_EXCL_STOP
 
 void sdb_sysdeps_init(void) {
     return utils_backend->sdb_sysdeps_init();

diff --git a/src/utils_unix.c b/src/utils_unix.c
index 12676feeb867a8b88dd2bcf556449e3d0dc6db29..39ee9a5c77400cc74fcc8eee4fbaf1797cb04d6c 100755 (executable)
--- a/src/utils_unix.c
+++ b/src/utils_unix.c
@@ -327,6 +327,7 @@ static int _sdb_mutex_unlock(sdb_mutex_t *mutex) {
     return pthread_mutex_unlock(mutex);
 }
 
+//LCOV_EXCL_START
 static int _sdb_cond_init(sdb_cond_t *cond, const void *unused) {
     return pthread_cond_init(cond, unused);
 }
@@ -338,6 +339,7 @@ static int _sdb_cond_wait(sdb_cond_t *cond, sdb_mutex_t *mutex) {
 static int _sdb_cond_broadcast(sdb_cond_t *cond) {
     return pthread_cond_broadcast(cond);
 }
+//LCOV_EXCL_STOP
 
 static void  _sdb_sysdeps_init(void)
 {