minor change. rename 'readed' to 'readn'

Change-Id: I2c43c769efb437ea29d97117900bd9405a1bcbd6

diff --git a/formats/ffmpeg/mm_file_format_aac.c b/formats/ffmpeg/mm_file_format_aac.c
index c554fe5..c3fbfe4 100644 (file)
--- a/formats/ffmpeg/mm_file_format_aac.c
+++ b/formats/ffmpeg/mm_file_format_aac.c
@@ -111,11 +111,11 @@ static bool __search_id3tag(tMMFILE_AAC_HANDLE *pData)
 {
        unsigned char tagHeader[MP3_TAGv2_HEADER_LEN] = {0, };
        int encSize = 0;
-       int readed = 0;
+       int readn = 0;
 
        mmfile_seek(pData->hFile, 0, MMFILE_SEEK_SET);
-       readed = mmfile_read(pData->hFile, tagHeader, MP3_TAGv2_HEADER_LEN);
-       mm_file_retvm_if_fails(RELEASE, MP3_TAGv2_HEADER_LEN == readed, false);
+       readn = mmfile_read(pData->hFile, tagHeader, MP3_TAGv2_HEADER_LEN);
+       mm_file_retvm_if_fails(RELEASE, MP3_TAGv2_HEADER_LEN == readn, false);
        mm_file_retvm_if_fails(RELEASE, IS_ID3V2_TAG(tagHeader), true);
 
        if (tagHeader[3] == 0xFF ||  tagHeader[4] == 0xFF ||
@@ -160,16 +160,16 @@ static bool __parse_id3_tag(tMMFILE_AAC_HANDLE *pData)
        unsigned char *tagBuff = NULL;
        AvFileContentInfo *hTag = &pData->id3Handle;
        bool ret = false;
-       int readed = 0;
+       int readn = 0;
 
        mmfile_seek(pData->hFile, pData->tagOffset, MMFILE_SEEK_SET);
        mm_file_retvm_if_fails(DEBUG, hTag->fileLen > 0, false);
 
        tagBuff = g_malloc0(hTag->fileLen);
 
-       readed = mmfile_read(pData->hFile, tagBuff, hTag->fileLen);
-       if (readed != hTag->fileLen) {
-               debug_error(DEBUG, "failed to read. %d, %lld\n", readed, hTag->fileLen);
+       readn = mmfile_read(pData->hFile, tagBuff, hTag->fileLen);
+       if (readn != hTag->fileLen) {
+               debug_error(DEBUG, "failed to read. %d, %lld\n", readn, hTag->fileLen);
                mmfile_free(tagBuff);
                return false;
        }
@@ -278,11 +278,11 @@ static bool __parse_aac_adif_header(tMMFILE_AAC_HANDLE *pData)
        int currentBitOffset = 0;
        unsigned int fieldValue = 0;
        int copyRightStatus = 0;
-       int readed = 0;
+       int readn = 0;
 
        mmfile_seek(pData->hFile, pData->streamOffset, MMFILE_SEEK_SET);
-       readed = mmfile_read(pData->hFile, adifHeader, MMFILE_AAC_ADIF_HEADER_MAX_SIZE);
-       if (readed < 0)
+       readn = mmfile_read(pData->hFile, adifHeader, MMFILE_AAC_ADIF_HEADER_MAX_SIZE);
+       if (readn < 0)
                return false;
 
        if (memcmp(adifHeader, "ADIF", 4))
@@ -359,11 +359,11 @@ static bool __parse_aac_adts_header(tMMFILE_AAC_HANDLE *pData)
        unsigned char adtsHeader[MMFILE_AAC_ADTS_HEADER_MAX_SIZE] = {0, };
        int currentBitOffset = 0;
        unsigned int fieldValue = 0;
-       int readed = 0;
+       int readn = 0;
 
        mmfile_seek(pData->hFile, pData->streamOffset, MMFILE_SEEK_SET);
-       readed = mmfile_read(pData->hFile, adtsHeader, MMFILE_AAC_ADTS_HEADER_MAX_SIZE);
-       if (readed < 0)
+       readn = mmfile_read(pData->hFile, adtsHeader, MMFILE_AAC_ADTS_HEADER_MAX_SIZE);
+       if (readn < 0)
                return false;
 
        if (!(adtsHeader[0] == 0xff && (adtsHeader[1] & 0xf0) == 0xf0))
@@ -416,10 +416,10 @@ static bool __get_next_adts_frame_length(tMMFILE_AAC_HANDLE *pData, int *frameLe
        unsigned char adtsHeader[MMFILE_AAC_ADTS_HEADER_MAX_SIZE] = {0, };
        int ret = true;
        long long filePosBefore = mmfile_tell(pData->hFile);
-       int readed = 0;
+       int readn = 0;
 
-       readed = mmfile_read(pData->hFile, adtsHeader, MMFILE_AAC_ADTS_HEADER_MAX_SIZE);
-       if (readed < 0)
+       readn = mmfile_read(pData->hFile, adtsHeader, MMFILE_AAC_ADTS_HEADER_MAX_SIZE);
+       if (readn < 0)
                return false;
 
        debug_msg(RELEASE, "\nFILE POS: %lld\n", filePosBefore);
@@ -457,7 +457,7 @@ static bool __mmfile_aacparser_open(MMFileAACHandle *handle, const char *path)
        int ret = MMFILE_UTIL_FAIL;
        unsigned char header[4] = {0, };
        int firstFrameLen = 0;
-       int readed = 0;
+       int readn = 0;
 
        mm_file_retvm_if_fails(DEBUG, path, false);
 
@@ -485,8 +485,8 @@ static bool __mmfile_aacparser_open(MMFileAACHandle *handle, const char *path)
        }
 
        mmfile_seek(privateData->hFile, privateData->streamOffset, MMFILE_SEEK_SET);
-       readed = mmfile_read(privateData->hFile, header, 4);
-       if (readed != 4)
+       readn = mmfile_read(privateData->hFile, header, 4);
+       if (readn != 4)
                goto exception;
 
        if (!memcmp(header, "ADIF", 4)) {

diff --git a/formats/ffmpeg/mm_file_format_amr.c b/formats/ffmpeg/mm_file_format_amr.c
index 8812732..496d59e 100644 (file)
--- a/formats/ffmpeg/mm_file_format_amr.c
+++ b/formats/ffmpeg/mm_file_format_amr.c
@@ -161,16 +161,16 @@ static void __parse_amr_stream(tMMFILE_AMR_HANDLE *pData)
        unsigned char amrMode = 0;
        unsigned char *p;
        unsigned char *buf;
-       int readed;
+       int readn;
        int pos;
        long long sum_bitrate = 0;
        long long frames_bitrate = 0;
 
        buf = g_malloc0(AMR_MAX_READ_BUF_SZ);
 
-       for (readed = 0;;) {
-               readed = mmfile_read(pData->hFile, buf, AMR_MAX_READ_BUF_SZ);
-               if (readed <= 0)
+       for (readn = 0;;) {
+               readn = mmfile_read(pData->hFile, buf, AMR_MAX_READ_BUF_SZ);
+               if (readn <= 0)
                        break;
 
                for (p = buf, pos = 0;;) {
@@ -182,10 +182,10 @@ static void __parse_amr_stream(tMMFILE_AMR_HANDLE *pData)
 
                        p += frameLen;
                        pos += frameLen;
-                       if (pos == readed) {
+                       if (pos == readn) {
                                break;
-                       } else if (pos > readed) {
-                               mmfile_seek(pData->hFile, (pos - readed), MMFILE_SEEK_CUR);
+                       } else if (pos > readn) {
+                               mmfile_seek(pData->hFile, (pos - readn), MMFILE_SEEK_CUR);
                                break;
                        }
                }

diff --git a/formats/ffmpeg/mm_file_format_imelody.c b/formats/ffmpeg/mm_file_format_imelody.c
index a36fb24..0efa56f 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_imelody.c
+++ b/formats/ffmpeg/mm_file_format_imelody.c
@@ -108,7 +108,7 @@ static unsigned char * __get_load_memory(const char *src, int *out_size)
        unsigned char *buf = NULL;
        MMFileIOHandle *fp = NULL;
        long long src_size = 0L;
-       int readed = 0;
+       int readn = 0;
        int ret = 0;
 
        /*open*/
@@ -129,8 +129,8 @@ static unsigned char * __get_load_memory(const char *src, int *out_size)
        buf = g_malloc0(src_size);
 
        /*read data*/
-       if ((readed = mmfile_read(fp, buf, src_size)) != src_size) {
-               debug_error(DEBUG, "read error. size = %d\n", readed);
+       if ((readn = mmfile_read(fp, buf, src_size)) != src_size) {
+               debug_error(DEBUG, "read error. size = %d\n", readn);
                goto failed;
        }
 

diff --git a/formats/ffmpeg/mm_file_format_midi.c b/formats/ffmpeg/mm_file_format_midi.c
index 74a91a0..06e9e55 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_midi.c
+++ b/formats/ffmpeg/mm_file_format_midi.c
@@ -757,7 +757,7 @@ static void __AvGetMidiDuration(char *szFileName, MIDI_INFO_SIMPLE *info)
        unsigned char *pIMYbuf = NULL;
        long dFileSize;
        int     sdCurrentTime = 0;
-       int readed = 0;
+       int readn = 0;
        int codecType = AV_DEC_AUDIO_MIDI;
        int is_xmf = 0;
 
@@ -781,8 +781,8 @@ static void __AvGetMidiDuration(char *szFileName, MIDI_INFO_SIMPLE *info)
        pbFile = g_malloc0(dFileSize + 1);
 
        /*read data*/
-       if ((readed = mmfile_read(hFile, pbFile, dFileSize)) != dFileSize) {
-               debug_error(DEBUG, "read error. size = %d\n", readed);
+       if ((readn = mmfile_read(hFile, pbFile, dFileSize)) != dFileSize) {
+               debug_error(DEBUG, "read error. size = %d\n", readn);
                goto _RELEASE_RESOURCE;
        }
 

diff --git a/formats/ffmpeg/mm_file_format_mmf.c b/formats/ffmpeg/mm_file_format_mmf.c
index 8745e71..9845c8c 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_mmf.c
+++ b/formats/ffmpeg/mm_file_format_mmf.c
@@ -1863,7 +1863,7 @@ static bool __mmf_ParseSkipXmf2Mmf(unsigned char *pbFile, unsigned int dFSize, u
 
 static int __mmf_file_mmf_get_duration(char *src, int is_xmf)
 {
-       int readed = 0;
+       int readn = 0;
        unsigned int xmf_skip_offset = 0;
        MMFileIOHandle *fp = NULL;
        unsigned char *buf = 0;
@@ -1898,8 +1898,8 @@ static int __mmf_file_mmf_get_duration(char *src, int is_xmf)
        buf = g_malloc0(src_size + 1);
 
        /*read data*/
-       if ((readed = mmfile_read(fp, buf, src_size)) <= 0) {
-               debug_error(DEBUG, "read error. size = %d\n", readed);
+       if ((readn = mmfile_read(fp, buf, src_size)) <= 0) {
+               debug_error(DEBUG, "read error. size = %d\n", readn);
 
                ret_msec = -1;
                goto _RELEASE_RESOURCE;

diff --git a/formats/ffmpeg/mm_file_format_wav.c b/formats/ffmpeg/mm_file_format_wav.c
index 0c825eb..178549b 100755 (executable)
--- a/formats/ffmpeg/mm_file_format_wav.c
+++ b/formats/ffmpeg/mm_file_format_wav.c
@@ -178,7 +178,7 @@ typedef struct {
 static bool __get_fmt_subchunk_offset(MMFileIOHandle *fp, long long limit, long long *offset)
 {
        long long fmt_offset;
-       int readed;
+       int readn;
        int i;
        unsigned char buf[4];
 
@@ -188,8 +188,8 @@ static bool __get_fmt_subchunk_offset(MMFileIOHandle *fp, long long limit, long
 
        for (i = 0; i < limit; i++) {
                mmfile_seek(fp, fmt_offset + i, MMFILE_SEEK_SET);
-               readed = mmfile_read(fp, buf, 4);
-               mm_file_retvm_if_fails(DEBUG, readed == 4, false);
+               readn = mmfile_read(fp, buf, 4);
+               mm_file_retvm_if_fails(DEBUG, readn == 4, false);
 
                if (buf[0] == 'f' && buf[1] == 'm' && buf[2] == 't' && buf[3] == ' ') {
                        *offset = fmt_offset + i;
@@ -202,7 +202,7 @@ static bool __get_fmt_subchunk_offset(MMFileIOHandle *fp, long long limit, long
 
 static unsigned char * __mmf_file_wave_get_header(char *src)
 {
-       int                             readed = 0;
+       int                             readn = 0;
        MMFileIOHandle  *fp = NULL;
        long long               src_size = 0L;
        unsigned char   *header = NULL;
@@ -222,9 +222,9 @@ static unsigned char * __mmf_file_wave_get_header(char *src)
        header = g_malloc0(MMF_FILE_WAVE_HEADER_LEN);
 
        /*read chunk data*/
-       readed = mmfile_read(fp, header, MMF_FILE_WAVE_CHUNK_LEN);
-       if (readed != MMF_FILE_WAVE_CHUNK_LEN) {
-               debug_error(DEBUG, "read error. size = %d\n", readed);
+       readn = mmfile_read(fp, header, MMF_FILE_WAVE_CHUNK_LEN);
+       if (readn != MMF_FILE_WAVE_CHUNK_LEN) {
+               debug_error(DEBUG, "read error. size = %d\n", readn);
                goto failed;
        }
 
@@ -240,9 +240,9 @@ static unsigned char * __mmf_file_wave_get_header(char *src)
        mmfile_seek(fp, offset, MMFILE_SEEK_SET);
 
        /*read sub chunk data*/
-       readed = mmfile_read(fp, header + MMF_FILE_WAVE_CHUNK_LEN, MMF_FILE_WAVE_SUBCHUNK_LEN);
-       if (readed != MMF_FILE_WAVE_SUBCHUNK_LEN) {
-               debug_error(DEBUG, "read error. size = %d\n", readed);
+       readn = mmfile_read(fp, header + MMF_FILE_WAVE_CHUNK_LEN, MMF_FILE_WAVE_SUBCHUNK_LEN);
+       if (readn != MMF_FILE_WAVE_SUBCHUNK_LEN) {
+               debug_error(DEBUG, "read error. size = %d\n", readn);
                goto failed;
        }
 

diff --git a/utils/mm_file_util_validity.c b/utils/mm_file_util_validity.c
index c99ceba..11c8e9e 100755 (executable)
--- a/utils/mm_file_util_validity.c
+++ b/utils/mm_file_util_validity.c
@@ -50,7 +50,7 @@ int MMFileFormatIsValidMP3(MMFileIOHandle *pFileIO, const char *mmfileuri, int f
        unsigned char buffer[_MMFILE_MP3_BUFFER_LENGTH] = {0, };
        long long  filesize = 0;
        unsigned int sizeID3 = 0;
-       int readed = 0, i = 0, j = 0;;
+       int readn = 0, i = 0, j = 0;;
        unsigned int startoffset = 0;
        int endoffset = 0;
        int frameSize = 0;
@@ -84,14 +84,14 @@ int MMFileFormatIsValidMP3(MMFileIOHandle *pFileIO, const char *mmfileuri, int f
 
        while (i < endoffset) {
                mmfile_seek(fp, i, MMFILE_SEEK_SET);
-               readed = mmfile_read(fp, buffer, _MMFILE_MP3_BUFFER_LENGTH);
-               if (readed < _MMFILE_MP3_HEADER_LENGTH) {
+               readn = mmfile_read(fp, buffer, _MMFILE_MP3_BUFFER_LENGTH);
+               if (readn < _MMFILE_MP3_HEADER_LENGTH) {
                        debug_error(RELEASE, "read error");
                        break;
                }
 
                offset = 1;
-               for (j = 0; (j <= readed - _MMFILE_MP3_HEADER_LENGTH); j = j + offset) {
+               for (j = 0; (j <= readn - _MMFILE_MP3_HEADER_LENGTH); j = j + offset) {
                        frameSize = _MMFileIsMP3Header(buffer + j);
 
                        offset = 1;
@@ -102,7 +102,7 @@ int MMFileFormatIsValidMP3(MMFileIOHandle *pFileIO, const char *mmfileuri, int f
                                        goto failMP3;
                                }
 
-                               if ((j + frameSize) >= (readed - _MMFILE_MP3_HEADER_LENGTH)) {
+                               if ((j + frameSize) >= (readn - _MMFILE_MP3_HEADER_LENGTH)) {
                                        debug_msg(RELEASE, "MP3 coner hit %d %d", j, frameSize);
                                        break;
                                }
@@ -153,7 +153,7 @@ int MMFileFormatIsValidAAC(MMFileIOHandle *pFileIO, const char *mmfileuri, int d
        unsigned char buffer[_MMFILE_AAC_BUFFER_LENGTH] = {0, };
        unsigned int sizeID3 = 0;
        long long    filesize = 0;
-       int readed = 0, i = 0, j = 0;
+       int readn = 0, i = 0, j = 0;
        int ret = 0;
        int startoffset = 0;
        int endoffset = 0;
@@ -187,16 +187,16 @@ int MMFileFormatIsValidAAC(MMFileIOHandle *pFileIO, const char *mmfileuri, int d
        while (i < endoffset) {
                mmfile_seek(fp, i, MMFILE_SEEK_SET);
 
-               readed = mmfile_read(fp, buffer, _MMFILE_AAC_BUFFER_LENGTH);
+               readn = mmfile_read(fp, buffer, _MMFILE_AAC_BUFFER_LENGTH);
 
-               if (readed < _MMFILE_AAC_HEADER_LENGTH) {
+               if (readn < _MMFILE_AAC_HEADER_LENGTH) {
                        debug_error(RELEASE, "read error");
                        break;
                }
 
-               debug_msg(RELEASE, "read error. size = %d. i = %d", readed, i);
+               debug_msg(RELEASE, "read error. size = %d. i = %d", readn, i);
 
-               for (j = 0; (j < readed - _MMFILE_AAC_HEADER_LENGTH); j++) {
+               for (j = 0; (j < readn - _MMFILE_AAC_HEADER_LENGTH); j++) {
 
                        sync = ((buffer[j] << 8) | (buffer[j + 1]));
 
@@ -210,7 +210,7 @@ int MMFileFormatIsValidAAC(MMFileIOHandle *pFileIO, const char *mmfileuri, int d
                                if ((j + frameSize) >= (endoffset - (i + 2))) {
                                        goto fail;
                                }
-                               if ((j + frameSize) >= (readed - 2)) {
+                               if ((j + frameSize) >= (readn - 2)) {
                                        debug_msg(RELEASE, "AAC coner hit %d %d", j, frameSize);
                                        break;
                                }
@@ -260,7 +260,7 @@ int MMFileFormatIsValidOGG(MMFileIOHandle *pFileIO, const char *mmfileuri, int d
        unsigned char buffer[_MMFILE_OGG_BUFFER_LENGTH] = {0, };
        unsigned int sizeID3 = 0;
        long long    filesize = 0;
-       int readed = 0, i = 0, j = 0;
+       int readn = 0, i = 0, j = 0;
        int startoffset = 0;
        int endoffset = 0;
        int ret = 0;
@@ -291,13 +291,13 @@ int MMFileFormatIsValidOGG(MMFileIOHandle *pFileIO, const char *mmfileuri, int d
        i = startoffset;
        while (i <= check_limit) {
                mmfile_seek(fp, i, MMFILE_SEEK_SET);
-               readed = mmfile_read(fp, buffer, _MMFILE_OGG_BUFFER_LENGTH);
-               if (readed < _MMFILE_OGG_HEADER_LENGTH) {
+               readn = mmfile_read(fp, buffer, _MMFILE_OGG_BUFFER_LENGTH);
+               if (readn < _MMFILE_OGG_HEADER_LENGTH) {
                        debug_error(RELEASE, "read error");
                        break;
                }
 
-               for (j = 0; (j <= readed - _MMFILE_OGG_HEADER_LENGTH); j++) {
+               for (j = 0; (j <= readn - _MMFILE_OGG_HEADER_LENGTH); j++) {
                        if (!memcmp(buffer + j, "OggS", 4)) {
                                ret = 1;
                                debug_msg(RELEASE, "Header Detected at %d", i + j);
@@ -332,7 +332,7 @@ int MMFileFormatIsValidMID(MMFileIOHandle *pFileIO, const char *mmfileuri, int d
        MMFileIOHandle *fp = pFileIO;
        unsigned char buffer[_MMFILE_MIDI_BUFFER_LENGTH] = {0, };
        long long    filesize = 0;
-       int readed = 0, i = 0, j = 0;
+       int readn = 0, i = 0, j = 0;
        int startoffset = 0;
        int endoffset = 0;
        int ret = 0;
@@ -357,13 +357,13 @@ int MMFileFormatIsValidMID(MMFileIOHandle *pFileIO, const char *mmfileuri, int d
        i = startoffset;
        while (i <= check_limit) {
                mmfile_seek(fp, i, MMFILE_SEEK_SET);
-               readed = mmfile_read(fp, buffer, _MMFILE_MIDI_BUFFER_LENGTH);
-               if (readed < _MMFILE_MIDI_HEADER_LENGTH) {
+               readn = mmfile_read(fp, buffer, _MMFILE_MIDI_BUFFER_LENGTH);
+               if (readn < _MMFILE_MIDI_HEADER_LENGTH) {
                        debug_error(RELEASE, "read error");
                        break;
                }
 
-               for (j = 0; (j <= readed - _MMFILE_MIDI_HEADER_LENGTH); j++) {
+               for (j = 0; (j <= readn - _MMFILE_MIDI_HEADER_LENGTH); j++) {
                        if (!memcmp(buffer + j, "MThd", 4) || !memcmp(buffer + j, "XMF_", 4) || !memcmp(buffer + j, "IREZ", 4)) {
                                ret = 1;
                                debug_msg(RELEASE, "Header Detected at %d", i + j);