}
v2TagExistCheck = mmfile_malloc(MP3_TAGv2_HEADER_LEN);
- if (v2TagExistCheck == NULL) {
+ if (!v2TagExistCheck) {
debug_error(DEBUG, "malloc failed.\n");
goto EXCEPTION;
}
/* check ID3v2 header */
- if (mmfile_read(hFile, v2TagExistCheck, MP3_TAGv2_HEADER_LEN) > 0) {
- __AvGetID3v2Header(v2TagExistCheck, MP3_TAGv2_HEADER_LEN, &pInfo->tagV2Info);
- mmfile_free(v2TagExistCheck);
- } else {
+ if (mmfile_read(hFile, v2TagExistCheck, MP3_TAGv2_HEADER_LEN) != MP3_TAGv2_HEADER_LEN) {
debug_error(DEBUG, "v2TagExistCheck value read fail!\n");
mmfile_free(v2TagExistCheck);
goto EXCEPTION;
}
+ __AvGetID3v2Header(v2TagExistCheck, MP3_TAGv2_HEADER_LEN, &pInfo->tagV2Info);
+ mmfile_free(v2TagExistCheck);
+
if (mmfile_seek(hFile, 0L, SEEK_SET) < 0)
goto EXCEPTION;
goto EXCEPTION;
}
- if (mmfile_read(hFile, buf, pInfo->tagV2Info.tagLen) <= 0) {
+ if (mmfile_read(hFile, buf, pInfo->tagV2Info.tagLen) != pInfo->tagV2Info.tagLen) {
mmfile_free(buf);
goto EXCEPTION;
}
pInfo->bV1tagFound = false;
/* read with TAG(ID3v1) length */
- if (mmfile_read(hFile, TagBuff, MP3TAGINFO_SIZE + TAGV1_SEEK_GAP) <= 0)
+ if (mmfile_read(hFile, TagBuff, MP3TAGINFO_SIZE + TAGV1_SEEK_GAP) != MP3TAGINFO_SIZE + TAGV1_SEEK_GAP)
goto EXCEPTION;
/* check and get TAG(ID3v1) information */
}
v2TagExistCheck = mmfile_malloc(MP3_TAGv2_HEADER_LEN);
- if (v2TagExistCheck == NULL) {
+ if (!v2TagExistCheck) {
debug_error(DEBUG, "malloc failed.\n");
goto EXCEPTION;
}
- if (mmfile_read(hFile, v2TagExistCheck, MP3_TAGv2_HEADER_LEN) > 0) {
- __AvGetID3v2Header(v2TagExistCheck, MP3_TAGv2_HEADER_LEN, &pInfo->tagV2Info);
- mmfile_free(v2TagExistCheck);
- } else {
+ if (mmfile_read(hFile, v2TagExistCheck, MP3_TAGv2_HEADER_LEN) != MP3_TAGv2_HEADER_LEN) {
debug_error(DEBUG, "v2TagExistCheck value read fail!\n");
mmfile_free(v2TagExistCheck);
goto EXCEPTION;
}
+ __AvGetID3v2Header(v2TagExistCheck, MP3_TAGv2_HEADER_LEN, &pInfo->tagV2Info);
+ mmfile_free(v2TagExistCheck);
+
if (mmfile_seek(hFile, 0L, SEEK_SET) < 0)
goto EXCEPTION;
goto EXCEPTION;
}
- if (mmfile_read(hFile, buf, bufLen) <= 0) {
+ if (mmfile_read(hFile, buf, bufLen) != (int)bufLen) {
mmfile_free(buf);
goto EXCEPTION;
}
- /* Is this needed? */
if (__AvGetLastID3v2offset(hFile, &head_offset)) {
debug_msg(RELEASE, "search start offset: %u\n", head_offset);
pInfo->tagV2Info.tagLen = head_offset;
if (mmfile_seek(hFile, pInfo->headerPos, SEEK_SET) < 0)
goto EXCEPTION;
- if (mmfile_read(hFile, header, 256) <= 0)
+ if (mmfile_read(hFile, header, 256) != 256)
goto EXCEPTION;
- if (__AvParseMp3Header(pInfo, header) == false)
+ if (!__AvParseMp3Header(pInfo, header))
goto EXCEPTION;
if (__AvParseXingHeader(pInfo, header) || __AvParseVBRIHeader(pInfo, header)) {
pInfo->bV1tagFound = false;
- if (mmfile_read(hFile, TagBuff, MP3TAGINFO_SIZE + TAGV1_SEEK_GAP) <= 0)
+ if (mmfile_read(hFile, TagBuff, MP3TAGINFO_SIZE + TAGV1_SEEK_GAP) != MP3TAGINFO_SIZE + TAGV1_SEEK_GAP)
goto EXCEPTION;
if (__AvGetID3v1Header(TagBuff, MP3TAGINFO_SIZE + TAGV1_SEEK_GAP, NULL))