Add static directive to __ms_get_ini_instance()

Declaration of this function prototype
in media_streamer_util.h is removed.

[Version] 0.1.34
[Issue Type] Improvement

Change-Id: Iccd1878192392bd9ae6b454927436f9bf701f19e
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/include/media_streamer_util.h b/include/media_streamer_util.h
index 5d104bb..47664d4 100644 (file)
--- a/include/media_streamer_util.h
+++ b/include/media_streamer_util.h
@@ -262,13 +262,6 @@ typedef struct {
 void __ms_load_ini_settings(media_streamer_ini_t *ini);
 
 /**
- * @brief Get instance of ini dictionary or create one if it doesn`t exist.
- *
- * @since_tizen 3.0
- */
-dictionary *__ms_get_ini_instance(void);
-
-/**
  * @brief Read and copy string reading from ini file.
  *
  * @since_tizen 3.0

diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec
index 7941314..3faecfe 100644 (file)
--- a/packaging/capi-media-streamer.spec
+++ b/packaging/capi-media-streamer.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-streamer
 Summary:    A Media Streamer API
-Version:    0.1.33
+Version:    0.1.34
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_streamer_util.c b/src/media_streamer_util.c
index f089962..1ece08c 100644 (file)
--- a/src/media_streamer_util.c
+++ b/src/media_streamer_util.c
@@ -85,28 +85,32 @@ static const format_s format_table[] = {
        {MEDIA_FORMAT_MAX, NULL}
 };
 
-static void __ms_check_ini_status(void);
-
-gchar *__ms_ini_get_string(const char *ini_path, char *default_str)
+static void __ms_check_ini_status(void)
 {
-       const char *result_str = default_str;
+       FILE *fp = fopen(MEDIA_STREAMER_INI_PATH, "r");
+       int file_size = 0;
+       int status = 0;
 
        ms_debug_fenter();
 
-       ms_retvm_if(ini_path == NULL, NULL, "Invalid ini path");
-
-       if (__ms_get_ini_instance()) {
-               const char *str = iniparser_getstring(__ms_get_ini_instance(), ini_path, default_str);
-               if (str && (strlen(str) > 0) && (strlen(str) < INI_MAX_STRLEN))
-                       result_str = str;
+       if (fp == NULL) {
+               ms_debug("Failed to get media streamer ini file.");
+       } else {
+               fseek(fp, 0, SEEK_END);
+               file_size = ftell(fp);
+               fclose(fp);
+               if (file_size < 5) {
+                       ms_debug("media_streamer.ini file size=%d, Corrupted! Removed", file_size);
+                       status = g_remove(MEDIA_STREAMER_INI_PATH);
+                       if (status == -1)
+                               ms_error("failed to delete corrupted ini");
+               }
        }
 
        ms_debug_fleave();
-
-       return result_str ? g_strdup(result_str) : NULL;
 }
 
-dictionary *__ms_get_ini_instance(void)
+static dictionary *__ms_get_ini_instance(void)
 {
        static dictionary *instance = NULL;
 
@@ -131,6 +135,25 @@ dictionary *__ms_get_ini_instance(void)
        return instance;
 }
 
+gchar *__ms_ini_get_string(const char *ini_path, char *default_str)
+{
+       const char *result_str = default_str;
+
+       ms_debug_fenter();
+
+       ms_retvm_if(ini_path == NULL, NULL, "Invalid ini path");
+
+       if (__ms_get_ini_instance()) {
+               const char *str = iniparser_getstring(__ms_get_ini_instance(), ini_path, default_str);
+               if (str && (strlen(str) > 0) && (strlen(str) < INI_MAX_STRLEN))
+                       result_str = str;
+       }
+
+       ms_debug_fleave();
+
+       return result_str ? g_strdup(result_str) : NULL;
+}
+
 void __ms_ini_read_list(const char *key, gchar ***list)
 {
        const gchar *str;
@@ -193,32 +216,6 @@ void __ms_load_ini_settings(media_streamer_ini_t *ini)
 
 }
 
-static void __ms_check_ini_status(void)
-{
-       FILE *fp = fopen(MEDIA_STREAMER_INI_PATH, "r");
-       int file_size = 0;
-       int status = 0;
-
-       ms_debug_fenter();
-
-       if (fp == NULL) {
-               ms_debug("Failed to get media streamer ini file.");
-       } else {
-               fseek(fp, 0, SEEK_END);
-               file_size = ftell(fp);
-               fclose(fp);
-               if (file_size < 5) {
-                       ms_debug("media_streamer.ini file size=%d, Corrupted! Removed", file_size);
-                       status = g_remove(MEDIA_STREAMER_INI_PATH);
-                       if (status == -1)
-                               ms_error("failed to delete corrupted ini");
-               }
-       }
-
-       ms_debug_fleave();
-
-}
-
 const gchar *__ms_convert_mime_to_string_format(media_format_mimetype_e mime)
 {
        gchar *format_name = NULL;