Fix invalid suffix literal C++11 error

diff --git a/download_db_service/download-db-service-main.cpp b/download_db_service/download-db-service-main.cpp
index 86b697c..55a024e 100755 (executable)
--- a/download_db_service/download-db-service-main.cpp
+++ b/download_db_service/download-db-service-main.cpp
@@ -53,17 +53,17 @@ bool DownloadHistoryDB::openDB()
        DM_LOGV("");
        int ret = 0;
        if (historyDb == NULL) {
-               DM_LOGD("TRY to open [%s]", DBDATADIR"/"HISTORYDB);
-               if (sqlite3_open_v2(DBDATADIR"/"HISTORYDB, &historyDb,
+               DM_LOGD("TRY to open [%s]", DBDATADIR "/" HISTORYDB);
+               if (sqlite3_open_v2(DBDATADIR "/" HISTORYDB, &historyDb,
                                SQLITE_OPEN_READWRITE, NULL) != SQLITE_OK) {
-                       DM_LOGD("[ERROR][%s][%s]", DBDATADIR"/"HISTORYDB,
+                       DM_LOGD("[ERROR][%s][%s]", DBDATADIR "/" HISTORYDB,
                                sqlite3_errmsg(historyDb));
 
                        int errorcode = sqlite3_errcode(historyDb);
                        closeDB();
                        if (errorcode == SQLITE_CORRUPT) {
-                               DM_LOGD("unlink [%s]", DBDATADIR"/"HISTORYDB);
-                               //unlink(DBDATADIR"/"HISTORYDB);
+                               DM_LOGD("unlink [%s]", DBDATADIR "/" HISTORYDB);
+                               //unlink(DBDATADIR "/" HISTORYDB);
                                errorcode = SQLITE_CANTOPEN;
                        }
 
@@ -96,9 +96,9 @@ void DownloadHistoryDB::closeDB()
 
 bool DownloadHistoryDB::loadSqlSchema(void)
 {
-       if (sqlite3_open_v2(DBDATADIR"/"HISTORYDB, &historyDb,
+       if (sqlite3_open_v2(DBDATADIR "/" HISTORYDB, &historyDb,
                                SQLITE_OPEN_READWRITE |SQLITE_OPEN_CREATE, NULL) != SQLITE_OK) {
-               DM_LOGD("[ERROR][%s][%s]", DBDATADIR"/"HISTORYDB,
+               DM_LOGD("[ERROR][%s][%s]", DBDATADIR "/" HISTORYDB,
                                sqlite3_errmsg(historyDb));
                closeDB();
                return false;

diff --git a/oma-parser/oma-parser-common.h b/oma-parser/oma-parser-common.h
index 4505cdd..38e9c81 100755 (executable)
--- a/oma-parser/oma-parser-common.h
+++ b/oma-parser/oma-parser-common.h
@@ -53,17 +53,17 @@
 #undef LOG_TAG
 #endif
 #define LOG_TAG "oma-parser"
-#define OP_LOGD(format, ...) ;//LOGD("[%s:%d] "format" \n", __FUNCTION__, __LINE__, ##__VA_ARGS__);
-#define OP_LOGE(format, ...) LOGE("[%s:%d] "format" \n", __FUNCTION__, __LINE__, ##__VA_ARGS__);
-#define OP_SLOG(format, ...) SECURE_LOGD("[%s:%d] "format" \n", __FUNCTION__, __LINE__, ##__VA_ARGS__);
+#define OP_LOGD(format, ...) ;//LOGD("[%s:%d] " format " \n", __FUNCTION__, __LINE__, ##__VA_ARGS__);
+#define OP_LOGE(format, ...) LOGE("[%s:%d] " format " \n", __FUNCTION__, __LINE__, ##__VA_ARGS__);
+#define OP_SLOG(format, ...) SECURE_LOGD("[%s:%d] " format " \n", __FUNCTION__, __LINE__, ##__VA_ARGS__);
 
 
 #else /* DEBUG_USING_DLOG */
-#define OP_LOGD(format, ...) fprintf(stderr, "[oma-parser:V][%u][%s:%d] "format" \n", \
+#define OP_LOGD(format, ...) fprintf(stderr, "[oma-parser:V][%u][%s:%d] " format " \n", \
        (unsigned int)syscall(__NR_gettid), __FUNCTION__, __LINE__, ##__VA_ARGS__);
-#define OP_LOGE(format, ...) fprintf(stderr, "[oma-parser:E][%u][%s:%d] "format" \n", \
+#define OP_LOGE(format, ...) fprintf(stderr, "[oma-parser:E][%u][%s:%d] " format " \n", \
        (unsigned int)syscall(__NR_gettid), __FUNCTION__, __LINE__, ##__VA_ARGS__);
-#define OP_SLOG(format, ...) fprintf(stderr, "[oma-parser:V][%u][%s:%d] "format" \n", \
+#define OP_SLOG(format, ...) fprintf(stderr, "[oma-parser:V][%u][%s:%d] " format " \n", \
        (unsigned int)syscall(__NR_gettid), __FUNCTION__, __LINE__, ##__VA_ARGS__);
 #endif /* DEBUG_USING_DLOG */
 

diff --git a/src/download-manager-history-db.cpp b/src/download-manager-history-db.cpp
index 6386d2b..b827464 100755 (executable)
--- a/src/download-manager-history-db.cpp
+++ b/src/download-manager-history-db.cpp
@@ -41,17 +41,17 @@ bool DownloadHistoryDB::openDB()
        DM_LOGV("");
        int ret = 0;
        if (historyDb == NULL) {
-               DM_LOGD("TRY to open [%s]", DBDATADIR"/"HISTORYDB);
-               if (sqlite3_open_v2(DBDATADIR"/"HISTORYDB, &historyDb,
+               DM_LOGD("TRY to open [%s]", DBDATADIR "/" HISTORYDB);
+               if (sqlite3_open_v2(DBDATADIR "/" HISTORYDB, &historyDb,
                                SQLITE_OPEN_READWRITE, NULL) != SQLITE_OK) {
-                       DM_LOGD("[ERROR][%s][%s]", DBDATADIR"/"HISTORYDB,
+                       DM_LOGD("[ERROR][%s][%s]", DBDATADIR "/" HISTORYDB,
                                sqlite3_errmsg(historyDb));
 
                        int errorcode = sqlite3_errcode(historyDb);
                        closeDB();
                        if (errorcode == SQLITE_CORRUPT) {
-                               DM_LOGD("unlink [%s]", DBDATADIR"/"HISTORYDB);
-                               unlink(DBDATADIR"/"HISTORYDB);
+                               DM_LOGD("unlink [%s]", DBDATADIR "/" HISTORYDB);
+                               unlink(DBDATADIR "/" HISTORYDB);
                                errorcode = SQLITE_CANTOPEN;
                        }
 
@@ -978,9 +978,9 @@ bool DownloadHistoryDB::clearData(void)
 
 bool DownloadHistoryDB::loadSqlSchema(void)
 {
-       if (sqlite3_open_v2(DBDATADIR"/"HISTORYDB, &historyDb,
+       if (sqlite3_open_v2(DBDATADIR "/" HISTORYDB, &historyDb,
                                SQLITE_OPEN_READWRITE |SQLITE_OPEN_CREATE, NULL) != SQLITE_OK) {
-               DM_LOGD("[ERROR][%s][%s]", DBDATADIR"/"HISTORYDB,
+               DM_LOGD("[ERROR][%s][%s]", DBDATADIR "/" HISTORYDB,
                                sqlite3_errmsg(historyDb));
                closeDB();
                return false;