From dc55a749c334f340e932d8047aa4c34170dc3ec8 Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Thu, 6 Dec 2018 14:06:36 +0900 Subject: [PATCH] Do not use "errno" to determine return value for configure file - "errno" could be changed unexpectedly by some other module anytime, so, we got unexpected return value sometimes. [Version] 0.10.175 [Profile] Common [Issue Type] Update [Dependency module] N/A [Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-unified_20181203.2] Change-Id: I565078d5a6a1f3dda1a268808d7d0796356e7dfb Signed-off-by: Jeongmo Yang --- packaging/libmm-camcorder.spec | 2 +- src/mm_camcorder_configure.c | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index c3dba0a..baefce8 100644 --- a/packaging/libmm-camcorder.spec +++ b/packaging/libmm-camcorder.spec @@ -1,6 +1,6 @@ Name: libmm-camcorder Summary: Camera and recorder library -Version: 0.10.174 +Version: 0.10.175 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/mm_camcorder_configure.c b/src/mm_camcorder_configure.c index 667d3ca..79a79bc 100644 --- a/src/mm_camcorder_configure.c +++ b/src/mm_camcorder_configure.c @@ -920,27 +920,24 @@ int _mmcamcorder_conf_get_info(MMHandleType handle, int type, const char *ConfFi _mmcam_dbg_log("Try open Configure File[%s]", conf_path); fp = fopen(conf_path, "r"); - if (fp == NULL) { + if (!fp) { _mmcam_dbg_warn("File open failed.[%s] retry...", conf_path); snprintf(conf_path, sizeof(conf_path), "%s/multimedia/%s", TZ_SYS_ETC, ConfFile); _mmcam_dbg_log("Try open Configure File[%s]", conf_path); fp = fopen(conf_path, "r"); - if (fp == NULL) + if (!fp) { _mmcam_dbg_warn("open failed.[%s] errno [%d]", conf_path, errno); + ret = MM_ERROR_CAMCORDER_NOT_SUPPORTED; + } } - if (fp != NULL) { + if (fp) { ret = _mmcamcorder_conf_parse_info(handle, type, fp, configure_info); fclose(fp); - } else { - if (errno == ENOENT) - ret = MM_ERROR_CAMCORDER_NOT_SUPPORTED; - else - ret = MM_ERROR_CAMCORDER_CREATE_CONFIGURE; } - _mmcam_dbg_log("Leave..."); + _mmcam_dbg_log("Leave [0x%x]", ret); return ret; } -- 2.7.4