Change the number of an array to 'G_N_ELEMENTS'

Change-Id: I9884b74732bfb3d4f66eda71341fdd7cb583bc6c

diff --git a/src/image_util_decode.c b/src/image_util_decode.c
index 3d2f8705d1bee73cafc3950ecd6b11b3b71ee41b..0b1fd44ec6f8c2844a62d73d56d7fd77cc0f3f9b 100644 (file)
--- a/src/image_util_decode.c
+++ b/src/image_util_decode.c
@@ -58,7 +58,7 @@ static int _convert_decode_scale_tbl[] = {
        MM_UTIL_JPEG_DECODE_DOWNSCALE_1_8,
 };
 
-#define _NUM_OF_SCALE                  (sizeof(_convert_decode_scale_tbl)/sizeof(int))
+#define _NUM_OF_SCALE                  G_N_ELEMENTS(_convert_decode_scale_tbl)
 #define _NOT_SUPPORTED_IMAGE_TYPE (-1)
 #define IMG_HEADER_LENGTH 12
 
@@ -122,7 +122,7 @@ static int __image_util_decode_check_image_type(const unsigned char *image_buffe
        image_util_retvm_if(!image_type, IMAGE_UTIL_ERROR_INVALID_PARAMETER, "Invalid image_type");
 
        *image_type = _NOT_SUPPORTED_IMAGE_TYPE;        /* init */
-       for (i = 0; i < sizeof(signature_info) / sizeof(signature_info[0]); i++) {
+       for (i = 0; i < G_N_ELEMENTS(signature_info); i++) {
                if (memcmp((const char *)image_buffer + signature_info[i].offset, signature_info[i].signature, signature_info[i].size) == 0) {
                        *image_type = signature_info[i].image_type;
                        break;

diff --git a/src/image_util_private.c b/src/image_util_private.c
old mode 100755 (executable)
new mode 100644 (file)
index 308fc69..baeabdc
--- a/src/image_util_private.c
+++ b/src/image_util_private.c
@@ -42,8 +42,6 @@ static const image_format_mimetype_pair_s image_format_mimetype_table[] = {
        { MM_UTIL_COLOR_NV61,           -1,                                             "Not support" }
 };
 
-static const unsigned int image_format_mimetype_table_size = sizeof(image_format_mimetype_table) / sizeof(image_format_mimetype_pair_s);
-
 static int _convert_colorspace_tbl[] = {
        [IMAGE_UTIL_COLORSPACE_YV12] = MM_UTIL_COLOR_YUV420,
        [IMAGE_UTIL_COLORSPACE_YUV422] = MM_UTIL_COLOR_YUV422,
@@ -154,7 +152,7 @@ static int _convert_webp_colorspace_tbl[] = {
 
 unsigned int _get_number_of_colorspace(void)
 {
-       return (unsigned int)(sizeof(_convert_colorspace_tbl)/sizeof(int));
+       return G_N_ELEMENTS(_convert_colorspace_tbl);
 }
 
 gboolean _is_valid_colorspace(image_util_colorspace_e colorspace)
@@ -291,7 +289,7 @@ static media_format_mimetype_e __image_format_to_mimetype(mm_util_color_format_e
 {
        unsigned int i = 0;
 
-       for (i = 0; i < image_format_mimetype_table_size; i++) {
+       for (i = 0; i < G_N_ELEMENTS(image_format_mimetype_table); i++) {
                if (image_format_mimetype_table[i].image_format == format) {
                        image_util_debug("imgp fmt: %d mimetype fmt: %s", format, image_format_mimetype_table[i].mimetype_name);
                        return image_format_mimetype_table[i].mimetype;
@@ -308,7 +306,7 @@ static mm_util_color_format_e __mimetype_to_image_format(media_format_mimetype_e
 {
        unsigned int i = 0;
 
-       for (i = 0; i < image_format_mimetype_table_size; i++) {
+       for (i = 0; i < G_N_ELEMENTS(image_format_mimetype_table); i++) {
                if (image_format_mimetype_table[i].mimetype == mimetype) {
                        image_util_debug("mimetype: %s imgp fmt: %d", image_format_mimetype_table[i].mimetype_name,
                                                image_format_mimetype_table[i].image_format);