summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaejeong Kim <backto.kim@samsung.com>2017-09-06 10:20:48 +0900
committerHaejeong Kim <backto.kim@samsung.com>2017-09-06 10:20:48 +0900
commit28c739735bc67a957864ba9491a94bd572138ae9 (patch)
tree5c6b1531bef8c585f17c787e7fb62ceda04b2f9e
parentea06703f58de361cada4b4f5bf30bfcf769dbd28 (diff)
downloadmedia-controller-28c739735bc67a957864ba9491a94bd572138ae9.tar.gz
media-controller-28c739735bc67a957864ba9491a94bd572138ae9.tar.bz2
media-controller-28c739735bc67a957864ba9491a94bd572138ae9.zip
Change-Id: I580a41493cbf79b7870d84087e9061aa94698399
-rwxr-xr-xsrc/media_controller_db.c26
-rwxr-xr-xsvc/media_controller_db_util.c6
2 files changed, 16 insertions, 16 deletions
diff --git a/src/media_controller_db.c b/src/media_controller_db.c
index 64f1396..7daf093 100755
--- a/src/media_controller_db.c
+++ b/src/media_controller_db.c
@@ -84,14 +84,14 @@ static int __mc_db_get_int_value_of_key(void *handle, const char *server_name, c
ret = sqlite3_prepare_v2(db_handle, sql_str, strlen(sql_str), &stmt, NULL);
if (SQLITE_OK != ret) {
- mc_error("prepare error [%s]\n", sqlite3_errmsg(db_handle));
+ mc_error("prepare error [%s]", sqlite3_errmsg(db_handle));
SQLITE3_SAFE_FREE(sql_str);
return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
}
ret = sqlite3_step(stmt);
if (SQLITE_ROW != ret) {
- mc_error("end of row [%s]\n", sqlite3_errmsg(db_handle));
+ mc_error("end of row [%s]", sqlite3_errmsg(db_handle));
SQLITE3_FINALIZE(stmt);
SQLITE3_SAFE_FREE(sql_str);
return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
@@ -123,14 +123,14 @@ static int __mc_db_get_ulong_value_of_key(void *handle, const char *server_name,
ret = sqlite3_prepare_v2(db_handle, sql_str, strlen(sql_str), &stmt, NULL);
if (SQLITE_OK != ret) {
- mc_error("prepare error [%s]\n", sqlite3_errmsg(db_handle));
+ mc_error("prepare error [%s]", sqlite3_errmsg(db_handle));
SQLITE3_SAFE_FREE(sql_str);
return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
}
ret = sqlite3_step(stmt);
if (SQLITE_ROW != ret) {
- mc_error("end of row [%s]\n", sqlite3_errmsg(db_handle));
+ mc_error("end of row [%s]", sqlite3_errmsg(db_handle));
SQLITE3_FINALIZE(stmt);
SQLITE3_SAFE_FREE(sql_str);
return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
@@ -217,7 +217,7 @@ int mc_db_connect(void **handle)
/*Register busy handler*/
ret = sqlite3_busy_handler(db_handle, __mc_db_busy_handler, NULL);
if (SQLITE_OK != ret) {
- mc_error("error when register busy handler %s\n", sqlite3_errmsg(db_handle));
+ mc_error("error when register busy handler %s", sqlite3_errmsg(db_handle));
db_util_close(db_handle);
*handle = NULL;
@@ -317,14 +317,14 @@ int mc_db_get_latest_server_name(void *handle, char **latest_server_name)
ret = sqlite3_prepare_v2(db_handle, sql_str, strlen(sql_str), &stmt, NULL);
if (SQLITE_OK != ret) {
- mc_error("prepare error [%s]\n", sqlite3_errmsg(db_handle));
+ mc_error("prepare error [%s]", sqlite3_errmsg(db_handle));
SQLITE3_SAFE_FREE(sql_str);
return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
}
ret = sqlite3_step(stmt);
if (SQLITE_ROW != ret) {
- mc_error("end of row [%s]\n", sqlite3_errmsg(db_handle));
+ mc_error("end of row [%s]", sqlite3_errmsg(db_handle));
SQLITE3_FINALIZE(stmt);
SQLITE3_SAFE_FREE(sql_str);
return MEDIA_CONTROLLER_ERROR_NONE; /*There is no activated server yet. */
@@ -388,13 +388,13 @@ int mc_db_get_metadata_info(void *handle, const char *server_name, mc_metadata_h
ret = sqlite3_prepare_v2(db_handle, sql_str, strlen(sql_str), &stmt, NULL);
if (SQLITE_OK != ret) {
- mc_error("prepare error [%s]\n", sqlite3_errmsg(db_handle));
+ mc_error("prepare error [%s]", sqlite3_errmsg(db_handle));
SQLITE3_SAFE_FREE(sql_str);
return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
}
ret = sqlite3_step(stmt);
if (SQLITE_ROW != ret) {
- mc_error("end of row [%s]\n", sqlite3_errmsg(db_handle));
+ mc_error("end of row [%s]", sqlite3_errmsg(db_handle));
SQLITE3_FINALIZE(stmt);
SQLITE3_SAFE_FREE(sql_str);
return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
@@ -589,14 +589,14 @@ int mc_db_check_server_table_exist(void *handle, const char *server_name, bool *
ret = sqlite3_prepare_v2(handle, sql_str, strlen(sql_str), &stmt, NULL);
if (SQLITE_OK != ret) {
- mc_error("prepare error [%s]\n", sqlite3_errmsg(handle));
+ mc_error("prepare error [%s]", sqlite3_errmsg(handle));
SQLITE3_SAFE_FREE(sql_str);
return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
}
ret = sqlite3_step(stmt);
if (SQLITE_ROW != ret) {
- mc_error("end of row [%s]\n", sqlite3_errmsg(handle));
+ mc_error("end of row [%s]", sqlite3_errmsg(handle));
SQLITE3_FINALIZE(stmt);
SQLITE3_SAFE_FREE(sql_str);
return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
@@ -630,14 +630,14 @@ int mc_db_foreach_server_list(void *handle, mc_activated_server_cb callback, voi
mc_retvm_if(!MC_STRING_VALID(sql_str), MEDIA_CONTROLLER_ERROR_INVALID_OPERATION, "SQL string is null");
ret = sqlite3_prepare_v2(db_handle, sql_str, strlen(sql_str), &stmt, NULL);
if (SQLITE_OK != ret) {
- mc_error("prepare error [%s]\n", sqlite3_errmsg(db_handle));
+ mc_error("prepare error [%s]", sqlite3_errmsg(db_handle));
SQLITE3_SAFE_FREE(sql_str);
return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
}
ret = sqlite3_step(stmt);
if (SQLITE_ROW != ret) {
- mc_error("end of row [%s]\n", sqlite3_errmsg(db_handle));
+ mc_error("end of row [%s]", sqlite3_errmsg(db_handle));
SQLITE3_FINALIZE(stmt);
SQLITE3_SAFE_FREE(sql_str);
return MEDIA_CONTROLLER_ERROR_NONE;
diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c
index dd1f86f..96b7ebb 100755
--- a/svc/media_controller_db_util.c
+++ b/svc/media_controller_db_util.c
@@ -49,7 +49,7 @@ static int __mc_foreach_table_list(void *handle, GList **list)
ret = sqlite3_prepare_v2(db_handle, sql_str, strlen(sql_str), &stmt, NULL);
if (SQLITE_OK != ret) {
- mc_error("prepare error [%s]\n", sqlite3_errmsg(db_handle));
+ mc_error("prepare error [%s]", sqlite3_errmsg(db_handle));
SQLITE3_SAFE_FREE(sql_str);
return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
}
@@ -200,7 +200,7 @@ int mc_db_util_connect(void **handle, uid_t uid)
/*Register busy handler*/
ret = sqlite3_busy_handler(db_handle, __mc_db_util_busy_handler, NULL);
if (SQLITE_OK != ret) {
- mc_error("error when register busy handler %s\n", sqlite3_errmsg(db_handle));
+ mc_error("error when register busy handler %s", sqlite3_errmsg(db_handle));
db_util_close(db_handle);
return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
}
@@ -328,7 +328,7 @@ int mc_db_util_init_latest_server_table(void *handle)
ret = sqlite3_prepare_v2(db_handle, sql_str, strlen(sql_str), &stmt, NULL);
if (SQLITE_OK != ret) {
- mc_error("prepare error [%s]\n", sqlite3_errmsg(db_handle));
+ mc_error("prepare error [%s]", sqlite3_errmsg(db_handle));
SQLITE3_SAFE_FREE(sql_str);
return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
}