Fix the Build Warning

Change-Id: Iefa30c05fde8e1f6fbaf9c4755ff153cd6c10111
Signed-off-by: cookie <cookie@samsung.com>

diff --git a/.gbs.conf b/.gbs.conf
index 28e27903c26e53940ccdebc8ec8570bca1eece31..fd395c976f52cef990de993fccbd5aa383a67f25 100755 (executable)
--- a/.gbs.conf
+++ b/.gbs.conf
@@ -10,10 +10,10 @@ url = https://api.tizen.org
 # Tizen v4.0 for unified
 #
 [repo.tz_v4.0_standard]
-url = http://download.tizen.org/snapshots/tizen/unified/latest/repos/standard/packages/
+url = http://download.tizen.org/snapshots/tizen/4.0-unified/latest/repos/standard/packages/
 
 [repo.tz_v4.0_emulator]
-url = http://download.tizen.org/snapshots/tizen/unified/latest/repos/emulator/packages/
+url = http://download.tizen.org/snapshots/tizen/4.0-unified/latest/repos/emulator/packages/
 
 ###############################################
 #
@@ -26,7 +26,7 @@ repos = repo.public_4.0_base_arm, repo.tz_v4.0_standard
 buildroot = ~/GBS-ROOT-TV-ARM-WAYLAND
 
 [repo.public_4.0_base_arm]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/arm/packages/
+url = http://download.tizen.org/snapshots/tizen/4.0-base/latest/repos/arm/packages/
 
 ###############################################
 #
@@ -38,7 +38,7 @@ repos = repo.public_4.0_base_arm64, repo.tz_v4.0_standard
 buildroot = ~/GBS-ROOT-TV-ARM-WAYLAND
 
 [repo.public_4.0_base_arm64]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/arm64/packages/
+url = http://download.tizen.org/snapshots/tizen/4.0-base/latest/repos/arm64/packages/
 
 ###############################################
 #
@@ -50,7 +50,7 @@ repos = repo.public_4.0_base_ia32, repo.tz_v4.0_standard
 buildroot = ~/GBS-ROOT-TV-ARM-WAYLAND
 
 [repo.public_4.0_base_ia32]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/ia32/packages/
+url = http://download.tizen.org/snapshots/tizen/4.0-base/latest/repos/ia32/packages/
 
 ###############################################
 #
@@ -62,7 +62,7 @@ repos = repo.public_4.0_base_x86_64, repo.tz_v4.0_standard
 buildroot = ~/GBS-ROOT-TV-ARM-WAYLAND
 
 [repo.public_4.0_base_x86_64]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/x86_64/packages/
+url = http://download.tizen.org/snapshots/tizen/4.0-base/latest/repos/x86_64/packages/
 
 ###############################################
 #
@@ -74,7 +74,7 @@ repos = repo.public_4.0_base_ia32, repo.tz_v4.0_emulator
 buildroot = ~/GBS-ROOT-TV-ARM-WAYLAND
 
 [repo.public_4.0_base_ia32]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/ia32/packages/
+url = http://download.tizen.org/snapshots/tizen/4.0-base/latest/repos/ia32/packages/
 
 ###############################################
 #
@@ -86,7 +86,7 @@ repos = repo.public_4.0_base_x86_64, repo.tz_v4.0_emulator
 buildroot = ~/GBS-ROOT-TV-ARM-WAYLAND
 
 [repo.public_4.0_base_x86_64]
-url = http://download.tizen.org/snapshots/tizen/base/latest/repos/x86_64/packages/
+url = http://download.tizen.org/snapshots/tizen/4.0-base/latest/repos/x86_64/packages/
 
 ###############################################
 

diff --git a/bookmark-adaptor/bookmark-adaptor-image.c b/bookmark-adaptor/bookmark-adaptor-image.c
index 9d54390a6ec0a6ba1bc00163253a988c8e02be29..d7933b66206cb8f45fe6801931e19fa28a3db943 100755 (executable)
--- a/bookmark-adaptor/bookmark-adaptor-image.c
+++ b/bookmark-adaptor/bookmark-adaptor-image.c
@@ -32,42 +32,6 @@ extern bp_error_defs errorcode;
 int __browser_adaptor_connect(int callback);
 int __browser_adaptor_disconnect(void);
 
-static int __bp_bookmark_adaptor_get_blob(const int id,
-       bp_command_defs cmd, unsigned char **value, int *length)
-{
-       if (id < 0 || value == NULL || length == NULL)
-               return -1;
-
-       BP_CHECK_PROVIDER_STATUS;
-
-       int sock = BP_CHECK_IPC_SOCK;
-       g_bp_command.cmd = cmd;
-       g_bp_command.id = id;
-       int ret = bp_common_adaptor_get_blob(sock, &g_bp_command, value, length, &errorcode);
-       if (ret < 0 && errorcode == BP_ERROR_IO_ERROR)
-               __browser_adaptor_disconnect();
-       pthread_mutex_unlock(&g_adaptor_mutex);
-       return ret;
-}
-
-static int __bp_bookmark_adaptor_set_blob(const int id,
-       bp_command_defs cmd, const unsigned char *value, const int length)
-{
-       if (id < 0)
-               return -1;
-
-       BP_CHECK_PROVIDER_STATUS;
-
-       int sock = BP_CHECK_IPC_SOCK;
-       g_bp_command.cmd = cmd;
-       g_bp_command.id = id;
-       int ret = bp_common_adaptor_set_blob(sock, &g_bp_command, value, length, &errorcode);
-       if (ret < 0 && errorcode == BP_ERROR_IO_ERROR)
-               __browser_adaptor_disconnect();
-       pthread_mutex_unlock(&g_adaptor_mutex);
-       return ret;
-}
-
 static int __bp_bookmark_adaptor_get_blob_shm(const int id,
        bp_command_defs cmd, int *width, int *height, unsigned char **value,
        int *length)

diff --git a/common-adaptor/common-adaptor.c b/common-adaptor/common-adaptor.c
index 080c5420464de8f93e7945ea82f1318d0b700fdd..8ea693184b8a23bb0679e59e84d0382097078b15 100755 (executable)
--- a/common-adaptor/common-adaptor.c
+++ b/common-adaptor/common-adaptor.c
@@ -60,7 +60,7 @@ static int __adaptor_create_socket()
        bzero(&clientaddr, sizeof(clientaddr));
        clientaddr.sun_family = AF_UNIX;
        memset(clientaddr.sun_path, 0x00, sizeof(clientaddr.sun_path));
-       strncpy(clientaddr.sun_path, IPC_SOCKET, strlen(IPC_SOCKET));
+       strncpy(clientaddr.sun_path, IPC_SOCKET, strlen(IPC_SOCKET)+1);
        clientaddr.sun_path[strlen(IPC_SOCKET)] = '\0';
        if (connect(sockfd,
                (struct sockaddr *)&clientaddr, sizeof(clientaddr)) < 0) {

diff --git a/history-adaptor/history-adaptor.c b/history-adaptor/history-adaptor.c
index c184cbf9f676e43c0f5a12ff1a7e613b1e99fcfc..a2e7f2e2c8d69ad07493146315ab69a0029fcccd 100755 (executable)
--- a/history-adaptor/history-adaptor.c
+++ b/history-adaptor/history-adaptor.c
@@ -197,25 +197,6 @@ static int __bp_history_adaptor_send_cmd(const int id, bp_command_defs cmd)
        return 0;
 }
 
-static int __bp_history_adaptor_get_blob(const int id,
-       bp_command_defs cmd, unsigned char **value, int *length)
-{
-       if (id < 0 || value == NULL || length == NULL)
-               return -1;
-
-       BP_CHECK_PROVIDER_STATUS;
-
-       int sock = BP_CHECK_IPC_SOCK;
-       errorcode = BP_ERROR_NONE;
-       g_bp_command.cmd = cmd;
-       g_bp_command.id = id;
-       int ret = bp_common_adaptor_get_blob(sock, &g_bp_command, value, length, &errorcode);
-       if (ret < 0 && errorcode == BP_ERROR_IO_ERROR)
-               __browser_adaptor_disconnect();
-       pthread_mutex_unlock(&g_adaptor_mutex);
-       return ret;
-}
-
 static int __bp_history_adaptor_get_blob_shm(const int id,
        bp_command_defs cmd, int *width, int *height, unsigned char **value,
        int *length)

diff --git a/packaging/browser-provider.spec b/packaging/browser-provider.spec
index 794108c69c2d9fc94e36015e1e7a39d6664cbf3c..a781e580c70fe8a3cda1899b70c6caccb5eebd9e 100755 (executable)
--- a/packaging/browser-provider.spec
+++ b/packaging/browser-provider.spec
@@ -1,7 +1,7 @@
 
 Name:       browser-provider
 Summary:    sync in background.
-Version:    1.8.5
+Version:    1.8.6
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
@@ -50,7 +50,7 @@ Description: sync in background (developement files)
 %setup -q
 
 %define cmake \
-       CFLAGS="${CFLAGS:-%optflags} -fPIC -D_REENTRANT -fvisibility=hidden"; export CFLAGS \
+       CFLAGS="${CFLAGS:-%optflags} -fPIC -Wno-cpp -D_REENTRANT -fvisibility=hidden"; export CFLAGS \
        FFLAGS="${FFLAGS:-%optflags} -fPIC -fvisibility=hidden"; export FFLAGS \
        LDFLAGS+=" -Wl,--as-needed -Wl,--hash-style=both"; export LDFLAGS \
        %__cmake \\\

diff --git a/provider/browser-provider-db.c b/provider/browser-provider-db.c
index abc76ce8e1eeb77d6d7f125a2957b209c1f3ee9f..c6e0057afee5bc20bca72bfa40f53f8ba2593b35 100755 (executable)
--- a/provider/browser-provider-db.c
+++ b/provider/browser-provider-db.c
@@ -1979,7 +1979,7 @@ char *bp_db_get_text_stmt(sqlite3_stmt* stmt, int index)
                getstr = (char *)calloc(getbytes + 1, sizeof(char));
                if (getstr != NULL) {
                        char *gettext = NULL;
-                       gettext = sqlite3_column_text(stmt, index);
+                       gettext = (char *)sqlite3_column_text(stmt, index);
                        if (gettext != NULL){
                                memcpy(getstr, gettext,
                                                getbytes * sizeof(char));

diff --git a/provider/browser-provider-requests.c b/provider/browser-provider-requests.c
index 39d5c6e13cb166184ba666b9416b15a928fbbad9..36924892033ab00064e07265b4d1b76f8c3a490c 100755 (executable)
--- a/provider/browser-provider-requests.c
+++ b/provider/browser-provider-requests.c
@@ -28,7 +28,7 @@
 #include <pthread.h>
 
 #include <ITapiModem.h>
-#include <openssl/md5.h>
+#include <openssl/sha.h>
 
 #include "browser-provider.h"
 #include "browser-provider-log.h"
@@ -1588,18 +1588,18 @@ char *bp_get_my_deviceid()
 
                if (imei != NULL) {
                        // Make hash key with IMEI.
-                       MD5_CTX context;
-                       unsigned char digest[17] = { 0, };
+                       SHA256_CTX context;
+                       unsigned char digest[SHA256_DIGEST_LENGTH] = { 0, };
 
-                       MD5_Init(&context);
-                       MD5_Update(&context, imei, strlen(imei));
-                       MD5_Final(digest, &context);
+                       SHA256_Init(&context);
+                       SHA256_Update(&context, imei, strlen(imei));
+                       SHA256_Final(digest, &context);
 
                        int i;
                        for (i = 0; i < 16; i++)
                                digest[i] = '0' + (digest[i] % 10);
 
-                       device_id = strdup(digest);
+                       device_id = strdup((char *)digest);
                        free(imei);
                }
        }