[RQ170606-00002] fix invalid format argument types for dlog

Change-Id: Ib3cb1ae54e9a94de9044515cb37b751a695b9648

diff --git a/packaging/libmm-fileinfo.spec b/packaging/libmm-fileinfo.spec
index 7baba6b..230a02b 100755 (executable)
--- a/packaging/libmm-fileinfo.spec
+++ b/packaging/libmm-fileinfo.spec
@@ -1,6 +1,6 @@
 Name:      libmm-fileinfo
 Summary:    Media Fileinfo
-Version:    0.6.60
+Version:    0.6.61
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/utils/mm_file_util_tag.c b/utils/mm_file_util_tag.c
index e486614..89c6aca 100755 (executable)
--- a/utils/mm_file_util_tag.c
+++ b/utils/mm_file_util_tag.c
@@ -1840,7 +1840,7 @@ bool mm_file_id3tag_parse_v222(AvFileContentInfo *pInfo, unsigned char *buffer)
                                                                        debug_msg(RELEASE, "pInfo->pComment returned = (%s), pInfo->commentLen(%d)\n", pInfo->pComment, pInfo->commentLen);
                                                                        pInfo->tagV2Info.bDescriptionMarked = true;
                                                                } else {
-                                                                       debug_msg(RELEASE, "mmf_file_id3tag_parse_v222: failed to get Comment Info tmp(%d), purelyFramelen - encodingOffSet(%d)\n", tmp, purelyFramelen - encodingOffSet);
+                                                                       debug_msg(RELEASE, "mmf_file_id3tag_parse_v222: failed to get Comment Info tmp(%d), purelyFramelen - encodingOffSet(%lu)\n", tmp, purelyFramelen - encodingOffSet);
                                                                }
                                                        } else {
                                                                debug_msg(RELEASE, "mmf_file_id3tag_parse_v222: Description info too small to parse realCpyFrameNum(%d)\n", realCpyFrameNum);
@@ -1913,7 +1913,7 @@ bool mm_file_id3tag_parse_v222(AvFileContentInfo *pInfo, unsigned char *buffer)
                                                                        debug_msg(RELEASE, "pInfo->pURL returned = (%s), pInfo->urlLen(%d)\n", pInfo->pURL, pInfo->urlLen);
                                                                        pInfo->tagV2Info.bURLMarked = true;
                                                                } else {
-                                                                       debug_msg(RELEASE, "mmf_file_id3tag_parse_v222: failed to get URL Info tmp(%d), purelyFramelen - encodingOffSet(%d)\n", tmp, purelyFramelen - encodingOffSet);
+                                                                       debug_msg(RELEASE, "mmf_file_id3tag_parse_v222: failed to get URL Info tmp(%d), purelyFramelen - encodingOffSet(%lu)\n", tmp, purelyFramelen - encodingOffSet);
                                                                }
                                                        } else {
                                                                debug_msg(RELEASE, "mmf_file_id3tag_parse_v222: URL info too small to parse realCpyFrameNum(%d)\n", realCpyFrameNum);
@@ -2252,7 +2252,7 @@ bool mm_file_id3tag_parse_v223(AvFileContentInfo *pInfo, unsigned char *buffer)
                                                                        debug_msg(RELEASE, "tmp(%d) textEncodingType(%d), realCpyFrameNum(%d)\n", tmp, textEncodingType, realCpyFrameNum);
                                                                        pInfo->pComment = mmfile_string_convert((const char *)&pExtContent[tmp], realCpyFrameNum, "UTF-8", charset_array[textEncodingType], NULL, (unsigned int *)&pInfo->commentLen);
                                                                } else {
-                                                                       debug_msg(RELEASE, "failed to get Comment Info tmp(%d), purelyFramelen - encodingOffSet(%d)\n", tmp, purelyFramelen - encodingOffSet);
+                                                                       debug_msg(RELEASE, "failed to get Comment Info tmp(%d), purelyFramelen - encodingOffSet(%lu)\n", tmp, purelyFramelen - encodingOffSet);
                                                                        pInfo->commentLen = 0;
                                                                }
                                                        } else {
@@ -2339,7 +2339,7 @@ bool mm_file_id3tag_parse_v223(AvFileContentInfo *pInfo, unsigned char *buffer)
                                                                                                                synclyrics_info->time_info = (unsigned long)pExtContent[tmp + idx + 1] << 24 | (unsigned long)pExtContent[tmp + idx + 2] << 16 | (unsigned long)pExtContent[tmp + idx + 3] << 8  | (unsigned long)pExtContent[tmp + idx + 4];
                                                                                                                idx += 4;
                                                                                                                copy_start_pos = tmp + idx + 1;
-                                                                                                               debug_msg(RELEASE, "[%d][%s] idx[%d], copy_len[%d] copy_start_pos[%d]", synclyrics_info->time_info, synclyrics_info->lyric_info, idx, copy_len, copy_start_pos);
+                                                                                                               debug_msg(RELEASE, "[%lu][%s] idx[%d], copy_len[%d] copy_start_pos[%d]", synclyrics_info->time_info, synclyrics_info->lyric_info, idx, copy_len, copy_start_pos);
                                                                                                                copy_len = 0;
                                                                                                                synclyrics_info_list = g_list_append(synclyrics_info_list, synclyrics_info);
                                                                                                        }
@@ -2351,7 +2351,7 @@ bool mm_file_id3tag_parse_v223(AvFileContentInfo *pInfo, unsigned char *buffer)
                                                                                }
                                                                        }
                                                                } else {
-                                                                       debug_msg(RELEASE, "failed to get Synchronised lyrics Info tmp(%d), purelyFramelen - encodingOffSet(%d)\n", tmp, purelyFramelen - encodingOffSet);
+                                                                       debug_msg(RELEASE, "failed to get Synchronised lyrics Info tmp(%d), purelyFramelen - encodingOffSet(%lu)\n", tmp, purelyFramelen - encodingOffSet);
                                                                        pInfo->syncLyricsNum = 0;
                                                                }
                                                        } else {
@@ -2360,7 +2360,8 @@ bool mm_file_id3tag_parse_v223(AvFileContentInfo *pInfo, unsigned char *buffer)
                                                        }
                                                        tmp = 0;
 
-                                                       debug_msg(RELEASE, "pInfo->pSyncLyrics returned = (%s), pInfo->syncLyricsNum(%d)\n", pInfo->pSyncLyrics, pInfo->syncLyricsNum);
+                                                       //debug_msg(RELEASE, "pInfo->pSyncLyrics returned = (%s), pInfo->syncLyricsNum(%d)\n", pInfo->pSyncLyrics, pInfo->syncLyricsNum);
+                                                       debug_msg(RELEASE, "pInfo->syncLyricsNum(%d)\n", pInfo->syncLyricsNum);
                                                        pInfo->tagV2Info.bSyncLyricsMarked = true;
                                                } else if (strncmp((char *)CompTmp, "USLT", 4) == 0 && pInfo->tagV2Info.bUnsyncLyricsMarked == false) {
                                                        char *lang_info = strndup((char *)pExtContent, 3);
@@ -2440,7 +2441,7 @@ bool mm_file_id3tag_parse_v223(AvFileContentInfo *pInfo, unsigned char *buffer)
                                                                                _FREE_EX(char_set);
                                                                        }
                                                                } else {
-                                                                       debug_msg(RELEASE, "failed to get Unsynchronised lyrics Info tmp(%d), purelyFramelen - encodingOffSet(%d)\n", tmp, purelyFramelen - encodingOffSet);
+                                                                       debug_msg(RELEASE, "failed to get Unsynchronised lyrics Info tmp(%d), purelyFramelen - encodingOffSet(%lu)\n", tmp, purelyFramelen - encodingOffSet);
                                                                        pInfo->unsynclyricsLen = 0;
                                                                }
                                                        } else {
@@ -2648,7 +2649,7 @@ bool mm_file_id3tag_parse_v223(AvFileContentInfo *pInfo, unsigned char *buffer)
                                if (purelyFramelen != 0)
                                        needToloopv2taglen = MP3_TAGv2_23_TXT_HEADER_LEN;
 
-                               debug_msg(RELEASE, "This Frame's size is Zero! purelyFramelen(%d)\n", purelyFramelen);
+                               debug_msg(RELEASE, "This Frame's size is Zero! purelyFramelen(%lu)\n", purelyFramelen);
                        }
 
                        if (pExtContent)        _FREE_EX(pExtContent);
@@ -3027,7 +3028,7 @@ bool mm_file_id3tag_parse_v224(AvFileContentInfo *pInfo, unsigned char *buffer)
                                                                                                synclyrics_info->time_info = (unsigned long)pExtContent[tmp + idx + 1] << 24 | (unsigned long)pExtContent[tmp + idx + 2] << 16 | (unsigned long)pExtContent[tmp + idx + 3] << 8  | (unsigned long)pExtContent[tmp + idx + 4];
                                                                                                idx += 4;
                                                                                                copy_start_pos = tmp + idx + 1;
-                                                                                               debug_msg(RELEASE, "[%d][%s] idx[%d], copy_len[%d] copy_start_pos[%d]", synclyrics_info->time_info, synclyrics_info->lyric_info, idx, copy_len, copy_start_pos);
+                                                                                               debug_msg(RELEASE, "[%lu][%s] idx[%d], copy_len[%d] copy_start_pos[%d]", synclyrics_info->time_info, synclyrics_info->lyric_info, idx, copy_len, copy_start_pos);
                                                                                                copy_len = 0;
                                                                                                synclyrics_info_list = g_list_append(synclyrics_info_list, synclyrics_info);
                                                                                        }
@@ -3540,7 +3541,7 @@ void mm_file_id3tag_restore_content_info(AvFileContentInfo *pInfo)
                                debug_msg(RELEASE, "Failed to \"(...)\" value to genre = %s\n", pInfo->pGenre);
                        }
                } else {
-                       debug_msg(RELEASE, "mpegAudioGenre = %x\n", mpegAudioGenre);
+                       debug_msg(RELEASE, "mpegAudioGenre = %s\n", mpegAudioGenre);
                }
                if (mpegAudioGenre)
                        _FREE_EX(mpegAudioGenre);