X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmm_camcorder_configure.c;h=172f09e22a0289dd705c69d4d6a35363df9b3869;hb=f7e7a35df406a0d1afb7cf6294e3b7e6d4869c52;hp=80eae5df04a7929f32ef1c083abdb553cde30811;hpb=52db279f5bcd4db5baf17bc82c157343d8938119;p=platform%2Fcore%2Fmultimedia%2Flibmm-camcorder.git

diff --git a/src/mm_camcorder_configure.c b/src/mm_camcorder_configure.c
index 80eae5d..172f09e 100644
--- a/src/mm_camcorder_configure.c
+++ b/src/mm_camcorder_configure.c
@@ -33,8 +33,6 @@
 /*-----------------------------------------------------------------------
 |    MACRO DEFINITIONS:							|
 -----------------------------------------------------------------------*/
-#define CONFIGURE_PATH          "/usr/etc"
-#define CONFIGURE_PATH_RETRY    "/opt/etc"
 
 /*-----------------------------------------------------------------------
 |    GLOBAL VARIABLE DEFINITIONS					|
@@ -897,25 +895,20 @@ int _mmcamcorder_conf_get_info(MMHandleType handle, int type, const char *ConfFi
 {
 	int ret = MM_ERROR_NONE;
 	FILE *fd = NULL;
-	char *conf_path = NULL;
+	char conf_path[60] = {'\0',};
 
 	_mmcam_dbg_log("Opening...[%s]", ConfFile);
 
 	mmf_return_val_if_fail(ConfFile, FALSE);
 
-	conf_path = (char *)malloc(strlen(ConfFile) + strlen(CONFIGURE_PATH) + 3);
-	if (conf_path == NULL) {
-		_mmcam_dbg_err("malloc failed.");
-		return MM_ERROR_CAMCORDER_LOW_MEMORY;
-	}
-
-	snprintf(conf_path, strlen(ConfFile) + strlen(CONFIGURE_PATH) + 2, "%s/%s", CONFIGURE_PATH, ConfFile);
+	snprintf(conf_path, sizeof(conf_path), "%s/multimedia/%s", SYSCONFDIR, ConfFile);
 	_mmcam_dbg_log("Try open Configure File[%s]", conf_path);
 
 	fd = fopen(conf_path, "r");
 	if (fd == NULL) {
 		_mmcam_dbg_warn("File open failed.[%s] retry...", conf_path);
-		snprintf(conf_path, strlen(ConfFile) + strlen(CONFIGURE_PATH_RETRY) + 2, "%s/%s", CONFIGURE_PATH_RETRY, ConfFile);
+
+		snprintf(conf_path, sizeof(conf_path), "%s/multimedia/%s", TZ_SYS_ETC, ConfFile);
 		_mmcam_dbg_log("Try open Configure File[%s]", conf_path);
 		fd = fopen(conf_path, "r");
 		if (fd == NULL) {
@@ -934,11 +927,6 @@ int _mmcamcorder_conf_get_info(MMHandleType handle, int type, const char *ConfFi
 		}
 	}
 
-	if (conf_path != NULL) {
-		free(conf_path);
-		conf_path = NULL;
-	}
-
 	_mmcam_dbg_log("Leave...");
 
 	return ret;