Update define

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

diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c
index 64d6422..2aaf6b5 100755 (executable)
--- a/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@ -1318,20 +1318,13 @@ int _media_svc_extract_image_metadata(sqlite3 *handle, media_svc_content_info_s
        int exif_height = 0;
        ExifData *ed = NULL;
        int has_datetaken = FALSE;
-       int datetaken_size = 19;
        double fnumber = 0.0;
        int iso = 0;
        char *path = NULL;
 
        char buf[MEDIA_SVC_METADATA_LEN_MAX + 1] = { '\0' };
-       char description_buf[MEDIA_SVC_METADATA_DESCRIPTION_MAX + 1] = { '\0' };
-       char exposure_time_buf[MEDIA_SVC_METADATA_LEN_MAX + 1] = { '\0' };
-       char model_buf[MEDIA_SVC_METADATA_LEN_MAX + 1] = { '\0' };
 
        memset(buf, 0x00, sizeof(buf));
-       memset(description_buf, 0x00, sizeof(description_buf));
-       memset(exposure_time_buf, 0x00, sizeof(exposure_time_buf));
-       memset(model_buf, 0x00, sizeof(model_buf));
 
        if (content_info == NULL || content_info->media_type != MEDIA_SVC_MEDIA_TYPE_IMAGE) {
                media_svc_error("content_info == NULL || media_type != MEDIA_SVC_MEDIA_TYPE_IMAGE");
@@ -1386,14 +1379,14 @@ int _media_svc_extract_image_metadata(sqlite3 *handle, media_svc_content_info_s
 
        memset(buf, 0x00, sizeof(buf));
 
-       if (__media_svc_get_exif_info(ed, description_buf, NULL, NULL, EXIF_TAG_IMAGE_DESCRIPTION) == MS_MEDIA_ERR_NONE) {
-               if (strlen(description_buf) == 0) {
+       if (__media_svc_get_exif_info(ed, buf, NULL, NULL, EXIF_TAG_IMAGE_DESCRIPTION) == MS_MEDIA_ERR_NONE) {
+               if (strlen(buf) == 0) {
                        /*media_svc_debug("Use 'No description'"); */
                        ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.description, MEDIA_SVC_TAG_UNKNOWN);
                        if (ret != MS_MEDIA_ERR_NONE)
                                media_svc_error("strcpy error");
                } else {
-                       ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.description, description_buf);
+                       ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.description, buf);
                        if (ret != MS_MEDIA_ERR_NONE)
                                media_svc_error("strcpy error");
                }
@@ -1409,7 +1402,7 @@ int _media_svc_extract_image_metadata(sqlite3 *handle, media_svc_content_info_s
                if (strlen(buf) == 0) {
                        /*media_svc_debug("time is NULL"); */
                } else {
-                       ret = __media_svc_malloc_and_strncpy_with_size(&content_info->media_meta.datetaken, buf, datetaken_size);
+                       ret = __media_svc_malloc_and_strncpy_with_size(&content_info->media_meta.datetaken, buf, MEDIA_SVC_DATATAKEN_SIZE);
                        if (ret != MS_MEDIA_ERR_NONE) {
                                media_svc_error("strcpy error");
                        } else {
@@ -1428,7 +1421,7 @@ int _media_svc_extract_image_metadata(sqlite3 *handle, media_svc_content_info_s
                if (strlen(buf) == 0) {
                        /*media_svc_debug("time is NULL"); */
                } else {
-                       ret = __media_svc_malloc_and_strncpy_with_size(&content_info->media_meta.datetaken, buf, datetaken_size);
+                       ret = __media_svc_malloc_and_strncpy_with_size(&content_info->media_meta.datetaken, buf, MEDIA_SVC_DATATAKEN_SIZE);
                        if (ret != MS_MEDIA_ERR_NONE) {
                                media_svc_error("strcpy error");
                        } else {
@@ -1449,12 +1442,14 @@ int _media_svc_extract_image_metadata(sqlite3 *handle, media_svc_content_info_s
                        media_svc_debug("Timeline : %ld", content_info->timeline);
        }
 
+       memset(buf, 0x00, sizeof(buf));
+
        /* Get exposure_time value from exif. */
-       if (__media_svc_get_exif_info(ed, exposure_time_buf, NULL, NULL, EXIF_TAG_EXPOSURE_TIME) == MS_MEDIA_ERR_NONE) {
-               if (strlen(exposure_time_buf) == 0) {
+       if (__media_svc_get_exif_info(ed, buf, NULL, NULL, EXIF_TAG_EXPOSURE_TIME) == MS_MEDIA_ERR_NONE) {
+               if (strlen(buf) == 0) {
                        /* media_svc_debug("exposure_time_buf is NULL"); */
                } else {
-                       ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.exposure_time, exposure_time_buf);
+                       ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.exposure_time, buf);
                        if (ret != MS_MEDIA_ERR_NONE)
                                media_svc_error("strcpy error");
                }
@@ -1480,12 +1475,14 @@ int _media_svc_extract_image_metadata(sqlite3 *handle, media_svc_content_info_s
                content_info->media_meta.iso = 0;
        }
 
+       memset(buf, 0x00, sizeof(buf));
+
        /* Get model value from exif. */
-       if (__media_svc_get_exif_info(ed, model_buf, NULL, NULL, EXIF_TAG_MODEL) == MS_MEDIA_ERR_NONE) {
-               if (strlen(model_buf) == 0) {
+       if (__media_svc_get_exif_info(ed, buf, NULL, NULL, EXIF_TAG_MODEL) == MS_MEDIA_ERR_NONE) {
+               if (strlen(buf) == 0) {
                        /* media_svc_debug("model_buf is NULL"); */
                } else {
-                       ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.model, model_buf);
+                       ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.model, buf);
                        if (ret != MS_MEDIA_ERR_NONE)
                                media_svc_error("strcpy error");
                }
@@ -1832,8 +1829,7 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
 #if 0
                                ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.datetaken, content_info->media_meta.recorded_date);
 #else
-                               int datetaken_size = 19;
-                               ret = __media_svc_malloc_and_strncpy_with_size(&content_info->media_meta.datetaken, content_info->media_meta.recorded_date, datetaken_size);
+                               ret = __media_svc_malloc_and_strncpy_with_size(&content_info->media_meta.datetaken, content_info->media_meta.recorded_date, MEDIA_SVC_DATATAKEN_SIZE);
 #endif
                                if (ret != MS_MEDIA_ERR_NONE)
                                        media_svc_error("strcpy error");

diff --git a/src/include/common/media-svc-env.h b/src/include/common/media-svc-env.h
index 85a8b37..cce9cc3 100755 (executable)
--- a/src/include/common/media-svc-env.h
+++ b/src/include/common/media-svc-env.h
@@ -129,12 +129,12 @@ extern "C" {
 
 
 
-#define MEDIA_SVC_METADATA_LEN_MAX                     128                                             /**< Length of metadata*/
-#define MEDIA_SVC_METADATA_DESCRIPTION_MAX     512                                             /**< Length of description*/
-#define MEDIA_SVC_PATHNAME_SIZE                                4096                                    /**< Length of Path name. */
-#define MEDIA_SVC_UUID_SIZE                                            36                                              /**< Length of UUID*/
-#define MEDIA_SVC_QUERY_LEN_MAX                                4096*2                                  /**< Max Query length*/
-#define MEDIA_SVC_QUERY_LEN_NORMAL                     4096                                    /**< Normal Query length*/
+#define MEDIA_SVC_METADATA_LEN_MAX                     512                     /**< Length of metadata*/
+#define MEDIA_SVC_DATATAKEN_SIZE                       19                      /**< Length of datataken */
+#define MEDIA_SVC_PATHNAME_SIZE                        4096                    /**< Length of Path name. */
+#define MEDIA_SVC_UUID_SIZE                                    36                      /**< Length of UUID*/
+#define MEDIA_SVC_QUERY_LEN_MAX                        4096*2          /**< Max Query length*/
+#define MEDIA_SVC_QUERY_LEN_NORMAL             4096                    /**< Normal Query length*/
 
 
 #define MEDIA_SVC_TAG_UNKNOWN                          ""