[ITC][media-content][NonACR][Initialized path variables before usage]

Change-Id: I21c8dcf7335e183824bca67dca6b93c0c77de189
Signed-off-by: Nibha Sharma <nibha.sharma@samsung.com>
(cherry picked from commit 423f59dc3cf71fdbdfbf33bb611834a174744b89)

diff --git a/src/itc/media-content/ITs-media-content-bookmark.c b/src/itc/media-content/ITs-media-content-bookmark.c
index 37c2b7e428dc28312e21a96ab1497595b981194d..51baaf33fcd7935fa797862137f4ebaf369d9cb9 100755 (executable)
--- a/src/itc/media-content/ITs-media-content-bookmark.c
+++ b/src/itc/media-content/ITs-media-content-bookmark.c
@@ -102,8 +102,7 @@ void ITs_media_content_bookmark_startup(void)
 
        int nRet = media_content_connect();
        PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet));
-       CopyFileInfo("video");
-       CopyFileInfo("image");
+
        nRet = GetInternalStorageIdandPath();
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetInternalStorageId", "Return Value Not Correct", media_content_disconnect());
 
@@ -126,6 +125,8 @@ void ITs_media_content_bookmark_startup(void)
 
        nRet = GetFolderPath(STORAGE_DIRECTORY_IMAGES, g_szImageFolder);
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect());
+       CopyFileInfo("image");
+
        AppendPaths(g_szImageFolder, BOOKMARKIMAGE, g_szImagePath);
 
        nRet = media_content_scan_file(g_szImagePath);
@@ -133,6 +134,7 @@ void ITs_media_content_bookmark_startup(void)
 
        nRet = GetFolderPath(STORAGE_DIRECTORY_VIDEOS, g_szVideoFolder);
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect());
+       CopyFileInfo("video");
        AppendPaths(g_szVideoFolder, TESTVIDEO, g_szVideoPath);
 
        nRet = media_content_scan_file(g_szVideoPath);

diff --git a/src/itc/media-content/ITs-media-content-face.c b/src/itc/media-content/ITs-media-content-face.c
index 42e2e3464b369dc34acb90a3828dff463e2ac9be..71d3f9a4b6703cbe2cdc6cd87a48be9bde67faf1 100755 (executable)
--- a/src/itc/media-content/ITs-media-content-face.c
+++ b/src/itc/media-content/ITs-media-content-face.c
@@ -76,7 +76,7 @@ struct stat stBuff;
        g_bScanFeatureMismatch= false;
 
        g_bIsScanFeatureSupported = TCTCheckSystemInfoFeatureSupported(SCAN_FEATURE, API_NAMESPACE);
-       CopyFileInfo("image");
+
        int nRet = media_content_connect();
        PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet));
 
@@ -85,6 +85,7 @@ struct stat stBuff;
 
        nRet = GetFolderPath(STORAGE_DIRECTORY_IMAGES, g_szImageFolder);
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect());
+       CopyFileInfo("image");
 
        AppendPaths(g_szInternalStoragePath, TESTTEXT, g_szTextPath);
        nRet = media_info_insert_to_db(g_szTextPath, &g_hTextInfo);

diff --git a/src/itc/media-content/ITs-media-content-group.c b/src/itc/media-content/ITs-media-content-group.c
index 8ef45450371e4177c4138f2d7fb6c4e99b8c1ab0..b8a20a973eff490d6bd16de089d10061e2878956 100755 (executable)
--- a/src/itc/media-content/ITs-media-content-group.c
+++ b/src/itc/media-content/ITs-media-content-group.c
@@ -119,10 +119,14 @@ void ITs_media_content_group_startup(void)
 
        int nRet = media_content_connect();
        PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet));
-       CopyFileInfo("audio");
+
        nRet = GetInternalStorageIdandPath();
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetInternalStorageId", "Return Value Not Correct", media_content_disconnect());
 
+       nRet = GetFolderPath(STORAGE_DIRECTORY_MUSIC, g_szAudioFolder);
+       PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect());
+       CopyFileInfo("audio");
+
        AppendPaths(g_szInternalStoragePath, TESTTEXT, g_szTextPath);
 
        nRet = media_content_scan_file(g_szTextPath);

diff --git a/src/itc/media-content/ITs-media-content-image-meta.c b/src/itc/media-content/ITs-media-content-image-meta.c
index 615f9d87c8f78bbd6d7ca5a5e572f30d53100e7d..1f92fb6f8068d916411513f53fbd8b28729d2b75 100755 (executable)
--- a/src/itc/media-content/ITs-media-content-image-meta.c
+++ b/src/itc/media-content/ITs-media-content-image-meta.c
@@ -61,12 +61,14 @@ void ITs_media_content_image_meta_startup(void)
 
        int nRet = media_content_connect();
        PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet));
-       CopyFileInfo("image");
+
        nRet = GetInternalStorageIdandPath();
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetInternalStorageId", "Return Value Not Correct", media_content_disconnect());
 
        nRet = GetFolderPath(STORAGE_DIRECTORY_IMAGES, g_szImageFolder);
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect());
+       CopyFileInfo("image");
+
        AppendPaths(g_szInternalStoragePath, TESTTEXT, g_szTextPath);
        nRet = media_info_insert_to_db(g_szTextPath, &g_hTextInfo);
        if ( !g_bIsScanFeatureSupported )

diff --git a/src/itc/media-content/ITs-media-content-info.c b/src/itc/media-content/ITs-media-content-info.c
index 53a5bb8099cc1ff24e3ee20050abefe68a470c36..92387b86a838baa9bd13fc49c90f1974b5f10a76 100755 (executable)
--- a/src/itc/media-content/ITs-media-content-info.c
+++ b/src/itc/media-content/ITs-media-content-info.c
@@ -474,9 +474,7 @@ void ITs_media_content_info_startup(void)
        g_bScanFeatureMismatch= false;
 
        g_bIsScanFeatureSupported = TCTCheckSystemInfoFeatureSupported(SCAN_FEATURE, API_NAMESPACE);
-       CopyFileInfo("audio");
-       CopyFileInfo("video");
-       CopyFileInfo("image");
+
        int nRet = media_content_connect();
        PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet));
 
@@ -485,6 +483,7 @@ void ITs_media_content_info_startup(void)
 
        nRet = GetFolderPath(STORAGE_DIRECTORY_MUSIC, g_szAudioFolder);
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect());
+       CopyFileInfo("audio");
 
        AppendPaths(g_szInternalStoragePath, TESTTEXT, g_szTextPath);
        nRet = media_info_insert_to_db(g_szTextPath, &g_hTextInfo);
@@ -515,6 +514,8 @@ void ITs_media_content_info_startup(void)
 
        nRet = GetFolderPath(STORAGE_DIRECTORY_IMAGES, g_szImageFolder);
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect());
+       CopyFileInfo("image");
+
        AppendPaths(g_szImageFolder, TESTIMAGE, g_szImagePath);
        nRet = media_info_insert_to_db(g_szImagePath, &g_hImageInfo);
        PRINT_RESULTNONE_CLEANUP(MEDIA_CONTENT_ERROR_NONE, nRet, "media_info_insert_to_db", MediaContentGetError(nRet), media_content_disconnect());
@@ -526,6 +527,8 @@ void ITs_media_content_info_startup(void)
 
        nRet = GetFolderPath(STORAGE_DIRECTORY_VIDEOS, g_szVideoFolder);
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect());
+       CopyFileInfo("video");
+
        AppendPaths(g_szVideoFolder, TESTVIDEO, g_szVideoPath);
        nRet = media_info_insert_to_db(g_szVideoPath, &g_hVideoInfo);
        PRINT_RESULTNONE_CLEANUP(MEDIA_CONTENT_ERROR_NONE, nRet, "media_info_insert_to_db", MediaContentGetError(nRet), media_content_disconnect());

diff --git a/src/itc/media-content/ITs-media-content-playlist.c b/src/itc/media-content/ITs-media-content-playlist.c
index 385de6bc44364a087376390bed3bd8b1fe485686..969500dd47def097c24a813ce52bbc39cff451a2 100755 (executable)
--- a/src/itc/media-content/ITs-media-content-playlist.c
+++ b/src/itc/media-content/ITs-media-content-playlist.c
@@ -131,12 +131,13 @@ void ITs_media_content_playlist_startup(void)
 
        int nRet = media_content_connect();
        PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet));
-       CopyFileInfo("audio");
+
        nRet = GetInternalStorageIdandPath();
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetInternalStorageId", "Return Value Not Correct", media_content_disconnect());
 
        nRet = GetFolderPath(STORAGE_DIRECTORY_MUSIC, g_szAudioFolder);
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect());
+       CopyFileInfo("audio");
 
        AppendPaths(g_szInternalStoragePath, TESTTEXT, g_szTextPath);
 

diff --git a/src/itc/media-content/ITs-media-content-tag.c b/src/itc/media-content/ITs-media-content-tag.c
index 867a5c528fb3ed1da1e8e9d03e992a4fcbfe497a..4635936e8af4f50675e5af873b91e274fb0c43b8 100755 (executable)
--- a/src/itc/media-content/ITs-media-content-tag.c
+++ b/src/itc/media-content/ITs-media-content-tag.c
@@ -99,12 +99,13 @@ void ITs_media_content_tag_startup(void)
 
        int nRet = media_content_connect();
        PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet));
-       CopyFileInfo("image");
+
        nRet = GetInternalStorageIdandPath();
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetInternalStorageId", "Return Value Not Correct", media_content_disconnect());
 
        nRet = GetFolderPath(STORAGE_DIRECTORY_IMAGES, g_szImageFolder);
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect());
+       CopyFileInfo("image");
 
        AppendPaths(g_szInternalStoragePath, TESTTEXT, g_szTextPath);
 

diff --git a/src/itc/media-content/ITs-media-content-video-meta.c b/src/itc/media-content/ITs-media-content-video-meta.c
index b1c11f6ab1a3c30438f876d5f1cee562643279e2..742551d8ff7cb76baaa41a89d382f371919ac8e8 100755 (executable)
--- a/src/itc/media-content/ITs-media-content-video-meta.c
+++ b/src/itc/media-content/ITs-media-content-video-meta.c
@@ -46,12 +46,13 @@ void ITs_media_content_video_meta_startup(void)
 
        int nRet = media_content_connect();
        PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet));
-       CopyFileInfo("video");
+
        nRet = GetInternalStorageIdandPath();
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetInternalStorageId", "Return Value Not Correct", media_content_disconnect());
 
        nRet = GetFolderPath(STORAGE_DIRECTORY_VIDEOS, g_szVideoFolder);
        PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect());
+       CopyFileInfo("video");
 
        AppendPaths(g_szInternalStoragePath, TESTTEXT, g_szTextPath);
        nRet = media_info_insert_to_db(g_szTextPath, &g_hTextInfo);