X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmm_camcorder_configure.c;h=80eae5df04a7929f32ef1c083abdb553cde30811;hb=65d96c0d9c5525d13d894f0567302c1b24d8e966;hp=6445d54dd55a68ab59002355c392cfc0a7fa5c91;hpb=82c2496f7c00323b5b781d558447bd9d977e31a9;p=platform%2Fcore%2Fmultimedia%2Flibmm-camcorder.git diff --git a/src/mm_camcorder_configure.c b/src/mm_camcorder_configure.c index 6445d54..80eae5d 100644 --- a/src/mm_camcorder_configure.c +++ b/src/mm_camcorder_configure.c @@ -893,61 +893,58 @@ void _mmcamcorder_conf_init(MMHandleType handle, int type, camera_conf** configu } -int _mmcamcorder_conf_get_info(MMHandleType handle, int type, const char* ConfFile, camera_conf** configure_info) +int _mmcamcorder_conf_get_info(MMHandleType handle, int type, const char *ConfFile, camera_conf **configure_info) { - int ret = MM_ERROR_NONE; - FILE* fd = NULL; - char* conf_path = NULL; + int ret = MM_ERROR_NONE; + FILE *fd = NULL; + char *conf_path = NULL; - _mmcam_dbg_log( "Opening...[%s]", ConfFile ); + _mmcam_dbg_log("Opening...[%s]", ConfFile); - mmf_return_val_if_fail( ConfFile, FALSE ); + 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." ); + 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 ); - _mmcam_dbg_log( "Try open Configure File[%s]", conf_path ); + snprintf(conf_path, strlen(ConfFile) + strlen(CONFIGURE_PATH) + 2, "%s/%s", CONFIGURE_PATH, 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 ); - _mmcam_dbg_log( "Try open Configure File[%s]", conf_path ); - fd = fopen( conf_path, "r" ); - if( fd == NULL ) - { - _mmcam_dbg_warn("open failed.[%s] But keep going... Type[%d]", conf_path, type); + 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); + _mmcam_dbg_log("Try open Configure File[%s]", conf_path); + fd = fopen(conf_path, "r"); + if (fd == NULL) { + _mmcam_dbg_warn("open failed.[%s] errno [%d]", conf_path, errno); } } - if( fd != NULL ) - { - ret = _mmcamcorder_conf_parse_info( handle, type, fd, configure_info ); - fclose( fd ); - } - else - { - ret = MM_ERROR_CAMCORDER_CREATE_CONFIGURE; + if (fd != NULL) { + ret = _mmcamcorder_conf_parse_info(handle, type, fd, configure_info); + fclose(fd); + } else { + if (errno == ENOENT) { + ret = MM_ERROR_CAMCORDER_NOT_SUPPORTED; + } else { + ret = MM_ERROR_CAMCORDER_CREATE_CONFIGURE; + } } - if( conf_path != NULL ) - { - free( conf_path ); + if (conf_path != NULL) { + free(conf_path); conf_path = NULL; } - _mmcam_dbg_log( "Leave..." ); + _mmcam_dbg_log("Leave..."); return ret; } + int _mmcamcorder_conf_parse_info(MMHandleType handle, int type, FILE* fd, camera_conf** configure_info) { const unsigned int BUFFER_NUM_DETAILS = 256;