Use fclose directly

Already checking for null in all cases.
So no need safe_fclose function.

Change-Id: I9aac0f56862400d0882dd968e152e01a5ba532b0
Signed-off-by: minje.ahn <minje.ahn@samsung.com>

diff --git a/common/include/mm_util_private.h b/common/include/mm_util_private.h
index 76ea992..24de747 100644 (file)
--- a/common/include/mm_util_private.h
+++ b/common/include/mm_util_private.h
@@ -73,7 +73,6 @@ typedef struct {
 
 // for using fp like jpeg
 int mm_util_safe_fopen(const char *path, const char *mode, FILE **fp);
-void mm_util_safe_fclose(FILE *fp);
 
 // for others
 int mm_util_file_read(const char *path, void **data, size_t *size);

diff --git a/common/mm_util_private.c b/common/mm_util_private.c
index 1d92b42..8a0d3f6 100644 (file)
--- a/common/mm_util_private.c
+++ b/common/mm_util_private.c
@@ -69,12 +69,6 @@ int mm_util_safe_fopen(const char *path, const char *mode, FILE **fp)
        return MM_UTIL_ERROR_NONE;
 }
 
-void mm_util_safe_fclose(FILE *fp)
-{
-       if (fp)
-               fclose(fp);
-}
-
 int mm_util_file_read(const char *path, void **data, size_t *size)
 {
        gsize read_n = 0;

diff --git a/jpeg/mm_util_jpeg.c b/jpeg/mm_util_jpeg.c
index 70087a4..3a659d6 100644 (file)
--- a/jpeg/mm_util_jpeg.c
+++ b/jpeg/mm_util_jpeg.c
@@ -522,7 +522,7 @@ int mm_util_jpeg_encode_to_file(mm_util_image_h decoded, int quality, const char
                ret = mm_util_convert_colorspace(decoded, MM_UTIL_COLOR_YUV420, &_converted_image);
                if (ret != MM_UTIL_ERROR_NONE) {
                        mm_util_error("mm_util_convert_image failed (%d)", ret);
-                       mm_util_safe_fclose(fp);
+                       fclose(fp);
                        return ret;
                }
 
@@ -533,7 +533,7 @@ int mm_util_jpeg_encode_to_file(mm_util_image_h decoded, int quality, const char
        }
 
        fsync((int)(fp->_fileno));
-       mm_util_safe_fclose(fp);
+       fclose(fp);
 
        mm_util_fleave();
 
@@ -600,8 +600,7 @@ int mm_util_decode_from_jpeg_file(const char *file_path, mm_util_color_format_e
                ret = __mm_util_jpeg_decode(MM_UTIL_JPEG_FILE, fp, NULL, 0, fmt, downscale, decoded);
        }
 
-       mm_util_safe_fclose(fp);
-
+       fclose(fp);
        mm_util_fleave();
 
        return ret;