diff options
| author | Kyuho Jo <kyuho.jo@samsung.com> | 2015-11-10 12:15:42 +0900 |
|---|---|---|
| committer | Kyuho Jo <kyuho.jo@samsung.com> | 2015-11-10 12:27:30 +0900 |
| commit | 21d49c6eb66f6b7aea697db8faac70a0ebaea9e9 (patch) | |
| tree | 216e6a3d5c0418d9425f6251e11072813d4d37d4 /pkgmgr_shortcut | |
| parent | dfd21265704d9b67ccc7348b787a2710d3c318ce (diff) | |
| download | shortcut-21d49c6eb66f6b7aea697db8faac70a0ebaea9e9.tar.gz shortcut-21d49c6eb66f6b7aea697db8faac70a0ebaea9e9.tar.bz2 shortcut-21d49c6eb66f6b7aea697db8faac70a0ebaea9e9.zip | |
Merge from tizen 2.4 latestsubmit/tizen/20151111.080158accepted/tizen/wearable/20151111.095244accepted/tizen/tv/20151111.095227accepted/tizen/mobile/20151111.095210
Change-Id: I64a1f9ab319d7d2c9477ac51d6f69fdeaf488b7d
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>
Diffstat (limited to 'pkgmgr_shortcut')
| -rw-r--r-- | pkgmgr_shortcut/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | pkgmgr_shortcut/src/service_register.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgmgr_shortcut/CMakeLists.txt b/pkgmgr_shortcut/CMakeLists.txt index bcb4f0a..2207ec7 100644 --- a/pkgmgr_shortcut/CMakeLists.txt +++ b/pkgmgr_shortcut/CMakeLists.txt @@ -18,6 +18,7 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -g -Wall -Werror") ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"") ADD_DEFINITIONS("-DLOG_TAG=\"PKGMGR_SHORTCUT\"") +ADD_DEFINITIONS("-DDB_PATH=\"${DB_PATH}\"") ADD_LIBRARY(${PROJECT_NAME} SHARED src/service_register.c diff --git a/pkgmgr_shortcut/src/service_register.c b/pkgmgr_shortcut/src/service_register.c index 190e351..d5763bf 100755 --- a/pkgmgr_shortcut/src/service_register.c +++ b/pkgmgr_shortcut/src/service_register.c @@ -69,7 +69,7 @@ static struct { const char *dbfile; sqlite3 *handle; } s_info = { - .dbfile = "/usr/dbspace/.shortcut_service.db", + .dbfile = DB_PATH, .handle = NULL, }; @@ -744,7 +744,7 @@ static int db_init(void) } if (lstat(s_info.dbfile, &stat) < 0) { - ErrPrint("%s\n", strerror(errno)); + ErrPrint("%d\n", errno); db_util_close(s_info.handle); s_info.handle = NULL; return -EIO; @@ -815,7 +815,7 @@ static inline struct i18n_name *create_i18n_name(xmlChar *lang, xmlChar *name, x i18n = malloc(sizeof(*i18n)); if (!i18n) { - ErrPrint("Heap: %s\n", strerror(errno)); + ErrPrint("Heap: %d\n", errno); return NULL; } |