oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Undoing more indent silliness

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4536 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman
2006-08-03 02:45:23 +00:00
parent 7ad533cca5
commit 15c2aa765a
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tag.c
View File

@@ -224,8 +224,7 @@ static int getId3v2FooterSize(FILE * stream, long offset, int whence)
int bufsize; int bufsize;
bufsize = fillBuffer(buf, ID3_TAG_QUERYSIZE, stream, offset, whence); bufsize = fillBuffer(buf, ID3_TAG_QUERYSIZE, stream, offset, whence);
if (bufsize <= 0) if (bufsize <= 0) return 0;
return 0;
return id3_tag_query(buf, bufsize); return id3_tag_query(buf, bufsize);
} }
#endif #endif
@@ -242,13 +241,11 @@ static struct id3_tag *getId3Tag(FILE * stream, long offset, int whence)
/* It's ok if we get less than we asked for */ /* It's ok if we get less than we asked for */
bufsize = fillBuffer(buf, ID3_TAG_BUFLEN, stream, offset, whence); bufsize = fillBuffer(buf, ID3_TAG_BUFLEN, stream, offset, whence);
if (bufsize <= 0) if (bufsize <= 0) return NULL;
return NULL;
/* Look for a tag header */ /* Look for a tag header */
tagsize = id3_tag_query((const id3_byte_t *)buf, bufsize); tagsize = id3_tag_query((const id3_byte_t *)buf, bufsize);
if (tagsize <= 0) if (tagsize <= 0) return NULL;
return NULL;
if (tagsize <= bufsize) { if (tagsize <= bufsize) {
/* Got an id3 tag, and it fits in buf */ /* Got an id3 tag, and it fits in buf */
@@ -256,8 +253,7 @@ static struct id3_tag *getId3Tag(FILE * stream, long offset, int whence)
} else { } else {
/* Got an id3tag that overflows buf, so get a new one */ /* Got an id3tag that overflows buf, so get a new one */
mbuf = malloc(tagsize); mbuf = malloc(tagsize);
if (!mbuf) if (!mbuf) return NULL;
return NULL;
mbufsize = fillBuffer(mbuf, tagsize, stream, offset, whence); mbufsize = fillBuffer(mbuf, tagsize, stream, offset, whence);
if (mbufsize < tagsize) { if (mbufsize < tagsize) {