summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandeep Singh <randeep.s@samsung.com>2020-01-07 12:01:03 +0000
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>2020-01-07 12:01:03 +0000
commit686bef616b8ab42ca2a2a2b17f50abc543d6b6fc (patch)
tree7e88fe67f407dfcf7694174a4a58f0e952536bcc
parent41961f85f0bc777531dcdd495e94617e49b6aef8 (diff)
parent93f5412bf440e5b10c6920347af0acf600126b00 (diff)
downloadsync-manager-686bef616b8ab42ca2a2a2b17f50abc543d6b6fc.tar.gz
sync-manager-686bef616b8ab42ca2a2a2b17f50abc543d6b6fc.tar.bz2
sync-manager-686bef616b8ab42ca2a2a2b17f50abc543d6b6fc.zip
Merge "[Tizen 6.0] enable build with GCC 9.2" into tizensubmit/tizen/20200107.120244accepted/tizen/unified/20200108.131415
-rw-r--r--src/sync-service/CMakeLists.txt2
-rw-r--r--src/sync-service/SyncManager_RepositoryEngine.cpp12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/sync-service/CMakeLists.txt b/src/sync-service/CMakeLists.txt
index eeee79c..13fcf03 100644
--- a/src/sync-service/CMakeLists.txt
+++ b/src/sync-service/CMakeLists.txt
@@ -109,7 +109,7 @@ FOREACH(flag ${PKGS_CFLAGS})
SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
ENDFOREACH(flag)
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=hidden -fPIE")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=hidden -fPIE -Wno-psabi")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}")
SET(PKGS_LDFLAGS "${PKGS_LDFLAGS} -pie")
diff --git a/src/sync-service/SyncManager_RepositoryEngine.cpp b/src/sync-service/SyncManager_RepositoryEngine.cpp
index 7ed6243..4d54054 100644
--- a/src/sync-service/SyncManager_RepositoryEngine.cpp
+++ b/src/sync-service/SyncManager_RepositoryEngine.cpp
@@ -1720,10 +1720,10 @@ RepositoryEngine::InsertSyncJobToDB(const char *SvcAppId, const char *PkgName, i
snprintf(accId, sizeof(accId) - 1, "%d", AccountId);
char interval[16] = { 0, };
snprintf(interval, sizeof(interval) - 1, "%d", Interval);
- char expedit[2] = { 0, };
- snprintf(expedit, sizeof(expedit) - 1, "%d", Option & SYNC_OPTION_EXPEDITED);
- char noRetry[2] = { 0, };
- snprintf(noRetry, sizeof(noRetry) - 1, "%d", Option & SYNC_OPTION_NO_RETRY);
+ char expedit[16] = { 0, };
+ snprintf(expedit, sizeof(expedit) - 1, "%d", (Option & SYNC_OPTION_EXPEDITED));
+ char noRetry[16] = { 0, };
+ snprintf(noRetry, sizeof(noRetry) - 1, "%d", (Option & SYNC_OPTION_NO_RETRY));
if (UserData) {
bundle_iterate(UserData, bundIterCb, NULL);
@@ -1930,9 +1930,9 @@ RepositoryEngine::UpdateSyncJobToDB(const char *SvcAppId, int UserId, const char
snprintf(accId, sizeof(accId) - 1, "%d", AccountId);
char interval[16] = { 0, };
snprintf(interval, sizeof(interval) - 1, "%d", Interval);
- char expedit[2] = { 0, };
+ char expedit[16] = { 0, };
snprintf(expedit, sizeof(expedit) - 1, "%d", Option & SYNC_OPTION_EXPEDITED);
- char noRetry[2] = { 0, };
+ char noRetry[16] = { 0, };
snprintf(noRetry, sizeof(noRetry) - 1, "%d", Option & SYNC_OPTION_NO_RETRY);
if (UserData) {