fix svace issues

Change-Id: Ib377aa1d95bbd3768cf3722dd21ad72d83eab8bd
Signed-off-by: Jongkyu Koo <jk.koo@samsung.com>

diff --git a/server/ctsvc_server_person.c b/server/ctsvc_server_person.c
index 8824d03..6357007 100644 (file)
--- a/server/ctsvc_server_person.c
+++ b/server/ctsvc_server_person.c
@@ -557,19 +557,6 @@ void ctsvc_db_person_delete_callback(sqlite3_context  *context,
 #endif
 }
 
-static inline const char *__ctsvc_get_image_filename(const char *src)
-{
-       const char *dir = CTSVC_CONTACT_IMG_FULL_LOCATION;
-       int pos = 0;
-       while (dir[pos] == src[pos])
-               pos++;
-
-       if ('/' == src[pos])
-               return src + pos + 1;
-
-       return src+pos;
-}
-
 int ctsvc_person_aggregate(int person_id)
 {
        int ret, len = 0;

diff --git a/server/db/ctsvc_db_access_control.c b/server/db/ctsvc_db_access_control.c
index 0e0ce54..b409b6e 100644 (file)
--- a/server/db/ctsvc_db_access_control.c
+++ b/server/db/ctsvc_db_access_control.c
@@ -449,7 +449,7 @@ int ctsvc_is_owner(int addressbook_id)
        saved_smack = ctsvc_stmt_get_text(stmt, 1);
        smack = ctsvc_get_client_smack_label();
 
-       if (smack && STRING_EQUAL == strcmp(smack, saved_smack))
+       if (smack && saved_smack && STRING_EQUAL == strcmp(smack, saved_smack))
                ret = CONTACTS_ERROR_NONE;
 
        ctsvc_stmt_finalize(stmt);

diff --git a/server/db/ctsvc_db_query.c b/server/db/ctsvc_db_query.c
index 18cb218..b058d59 100644 (file)
--- a/server/db/ctsvc_db_query.c
+++ b/server/db/ctsvc_db_query.c
@@ -2434,12 +2434,13 @@ static int __ctsvc_db_search_records_exec(const char *view_uri,
                break;
 
        case CTSVC_ENUM_URI_READ_ONLY_PERSON_NUMBER:
+       {
+               bool need_or = false;
                if (range & CONTACTS_SEARCH_RANGE_DATA || range & CONTACTS_SEARCH_RANGE_EMAIL) {
                        ERR("Invalid range");
                        free(query);
                        return CONTACTS_ERROR_INVALID_PARAMETER;
                }
-               bool need_or = false;
                temp_len = SAFE_SNPRINTF(&query, &query_size, len, "SELECT ");
                if (0 <= temp_len) len += temp_len;
                temp_len = SAFE_SNPRINTF(&query, &query_size, len, projection);
@@ -2559,9 +2560,12 @@ static int __ctsvc_db_search_records_exec(const char *view_uri,
                temp_len = SAFE_SNPRINTF(&query, &query_size, len, ") as temp_contacts");
                if (0 <= temp_len)
                        len += temp_len;
+       }
                break;
 
        case CTSVC_ENUM_URI_READ_ONLY_PERSON_EMAIL:
+       {
+               bool need_or = false;
                if (range & CONTACTS_SEARCH_RANGE_NUMBER || range & CONTACTS_SEARCH_RANGE_DATA) {
                        free(query);
                        return CONTACTS_ERROR_INVALID_PARAMETER;
@@ -2637,6 +2641,7 @@ static int __ctsvc_db_search_records_exec(const char *view_uri,
                temp_len = SAFE_SNPRINTF(&query, &query_size, len, ") ");
                if (0 <= temp_len)
                        len += temp_len;
+       }
                break;
 
        case CTSVC_ENUM_URI_PERSON: