Cleanup header

[platform/core/multimedia/libmedia-service.git] / src / common / media-svc-storage.c

diff --git a/src/common/media-svc-storage.c b/src/common/media-svc-storage.c
index 0cca25e..1871921 100755 (executable)
--- a/src/common/media-svc-storage.c
+++ b/src/common/media-svc-storage.c
@@ -3,8 +3,6 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: Hyunjun Ko <zzoon.ko@samsung.com>, Haejeong Kim <backto.kim@samsung.com>
- *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -19,7 +17,8 @@
  *
  */
 
-#include "media-util-err.h"
+
+#include <media-util-user.h>
 #include "media-svc-debug.h"
 #include "media-svc-env.h"
 #include "media-svc-db-utils.h"
@@ -51,11 +50,11 @@ int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, char **sto
        return MS_MEDIA_ERR_NONE;
 }
 
-int _media_svc_append_storage(const char *storage_id, const char *storage_path, ms_user_storage_type_e storage_type, uid_t uid)
+int _media_svc_append_storage(const char *storage_id, const char *storage_path, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
-       char *sql = sqlite3_mprintf("INSERT INTO %q (storage_id, storage_path, storage_type) values (%Q, %Q, %d);",
-                                               DB_TABLE_STORAGE, storage_id, storage_path, storage_type);
+       char *sql = sqlite3_mprintf("INSERT INTO %q (storage_id, storage_path) values (%Q, %Q);",
+                                               DB_TABLE_STORAGE, storage_id, storage_path);
 
        ret = _media_svc_sql_query_direct(sql, uid);
        SQLITE3_SAFE_FREE(sql);
@@ -146,7 +145,7 @@ int _media_svc_update_storage_validity(const char *storage_id, int validity, uid
        char *sql = NULL;
 
        if (storage_id == NULL) {
-               sql = sqlite3_mprintf("UPDATE %q SET validity=%d;UPDATE %q SET validity=%d WHERE folder_storage_type > 0;UPDATE %q SET validity=%d WHERE media_storage_type > 0;",
+               sql = sqlite3_mprintf("UPDATE %q SET validity=%d;UPDATE %q SET validity=%d WHERE storage_uuid IS NOT 'media';UPDATE %q SET validity=%d WHERE storage_uuid IS NOT 'media';",
                        DB_TABLE_STORAGE, validity, DB_TABLE_FOLDER, validity, DB_TABLE_MEDIA, validity);
        } else {
                sql = sqlite3_mprintf("UPDATE %q SET validity=%d WHERE storage_id=%Q;UPDATE %q SET validity=%d WHERE storage_uuid=%Q;UPDATE %q SET validity=%d WHERE storage_uuid=%Q;",
@@ -171,7 +170,7 @@ int _media_svc_get_storage_uuid(sqlite3 *handle, const char *path, char *storage
        media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "Fail to get root path");
 
        if (STRING_VALID(internal_path) && strncmp(path, internal_path, strlen(internal_path)) == 0) {
-               SAFE_STRLCPY(storage_id, DB_TABLE_MEDIA, MEDIA_SVC_UUID_SIZE + 1);
+               g_strlcpy(storage_id, DB_TABLE_MEDIA, MEDIA_SVC_UUID_SIZE + 1);
                g_free(internal_path);
                return MS_MEDIA_ERR_NONE;
        }
@@ -184,7 +183,7 @@ int _media_svc_get_storage_uuid(sqlite3 *handle, const char *path, char *storage
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
        if (STRING_VALID((const char *)sqlite3_column_text(sql_stmt, 0)))
-               SAFE_STRLCPY(storage_id, (const char *)sqlite3_column_text(sql_stmt, 0), MEDIA_SVC_UUID_SIZE + 1);
+               g_strlcpy(storage_id, (const char *)sqlite3_column_text(sql_stmt, 0), MEDIA_SVC_UUID_SIZE + 1);
 
        SQLITE3_FINALIZE(sql_stmt);