Use sqlite3 APIs directly

sqlite3_free() already performs NULL checking.
No need macro.

Change-Id: Ib00882a463f288694abb889252980108976ea36f
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/lib/include/media-util-db.h b/lib/include/media-util-db.h
index 5c41c27db6ffcb7a8d9bc2d56db79f2ede9fd076..a5af02a65574980f314b5c38a46b288e309acd6f 100644 (file)
--- a/lib/include/media-util-db.h
+++ b/lib/include/media-util-db.h
@@ -27,8 +27,6 @@ extern "C" {
 #include <stdbool.h>
 #include <sqlite3.h>
 
-#define MS_SQL_SAFE_FREE(x)    {if (x != NULL) {sqlite3_free(x); x = NULL; } }
-
 int media_db_connect(sqlite3 **handle, uid_t uid, bool need_write);
 void media_db_disconnect(sqlite3 *handle);
 int media_db_request_update_db(const char *query_str, uid_t uid);

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index fc2e5c044b6a4c902bfee067f7fd422ea55c1a56..22204f3168f03ae695881ea63006e4c3c12ac680 100644 (file)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -162,7 +162,7 @@ static int __media_db_connect_db_with_handle(sqlite3 **db_handle, uid_t uid, boo
        /*For TV internal space issue, change TRUNCATE to OFF */
        sql = sqlite3_mprintf("%s", "PRAGMA journal_mode = OFF");
        ret = sqlite3_exec(*db_handle, sql, NULL, NULL, NULL);
-       MS_SQL_SAFE_FREE(sql);
+       sqlite3_free(sql);
        if (SQLITE_OK != ret) {
                if (*db_handle)
                        MSAPI_DBG_ERR("[error when change the journal mode] %s", sqlite3_errmsg(*db_handle));
@@ -197,7 +197,7 @@ EXEC_RETRY:
 
        if (SQLITE_OK != ret) {
                MSAPI_ERR_SLOG("Error[%s],Query[%s]", zErrMsg, sql_str);
-               MS_SQL_SAFE_FREE(zErrMsg);
+               sqlite3_free(zErrMsg);
                if (ret == SQLITE_BUSY) {
                        ret = MS_MEDIA_ERR_DB_BUSY_FAIL;
                } else if (ret == SQLITE_CONSTRAINT) {
@@ -341,14 +341,14 @@ int media_db_get_result(sqlite3 *handle, char *sql_str, sqlite3_stmt **stmt)
        MSAPI_RETVM_IF(sql_str == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "invalid query");
        if (handle == NULL) {
                MSAPI_DBG_ERR("handle is NULL");
-               MS_SQL_SAFE_FREE(sql_str);
+               sqlite3_free(sql_str);
                return MS_MEDIA_ERR_INVALID_PARAMETER;
        }
 
        MSAPI_DBG_SLOG("[SQL query] : %s", sql_str);
 
        err = sqlite3_prepare_v2(handle, sql_str, -1, stmt, NULL);
-       MS_SQL_SAFE_FREE(sql_str);
+       sqlite3_free(sql_str);
 
        if (err != SQLITE_OK) {
                MSAPI_DBG_ERR("prepare error %d[%s]", err, sqlite3_errmsg(handle));

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 524bff870946f9e2c9ce5185bac7f8bec3bddeb1..214cf722bb6f5c07d1f637422400fa6576b6dbfd 100644 (file)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.6.3
+Version:    0.6.4
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index e55c1bc3a1efe0fec9c3a3940a077f86a4bfc43d..653328f1f814d5bdba0dd7fd9e4662ae44bceba0 100644 (file)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -272,7 +272,7 @@ int ms_validity_change_all_items(sqlite3 *handle, const char *storage_id, bool v
        char *sql = sqlite3_mprintf("UPDATE media SET validity=%d WHERE storage_uuid=%Q;", validity, storage_id);
 #endif
        ret = media_db_update_db_direct(sql, uid);
-       MS_SQL_SAFE_FREE(sql);
+       sqlite3_free(sql);
 
        return ret;
 }
@@ -327,7 +327,7 @@ int ms_delete_invalid_items(sqlite3 *handle, const char *storage_id, uid_t uid)
 #endif
 
        ret = media_db_update_db_direct(sql, uid);
-       MS_SQL_SAFE_FREE(sql);
+       sqlite3_free(sql);
        if (ret != MS_MEDIA_ERR_NONE) {
                g_ptr_array_free(thumb_list, TRUE);
                return ret;
@@ -366,7 +366,7 @@ int ms_set_folder_item_validity(sqlite3 *handle, const char *storage_id, const c
 #endif
 
        ret = media_db_update_db_direct(sql, uid);
-       MS_SQL_SAFE_FREE(sql);
+       sqlite3_free(sql);
 
        return ret;
 }
@@ -414,7 +414,7 @@ int ms_delete_invalid_folder(const char *storage_id, uid_t uid)
 
        sql = sqlite3_mprintf("DELETE FROM folder WHERE validity IN (%d, %d) AND storage_uuid=%Q", MS_INVALID, MS_SCANNING, storage_id);
        ret = media_db_update_db_direct(sql, uid);
-       MS_SQL_SAFE_FREE(sql);
+       sqlite3_free(sql);
 
        return ret;
 }