summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-13 15:28:36 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-13 15:28:36 +0100
commita67da65ffd7d96748aa1605c3a03601df5ec8c55 (patch)
treea28281ff4e7980d4abea9bd5c03ec6903e5d65d4
parent326d7c7dda2fa44257c0658d27e95b592653aefb (diff)
downloadxine-lib-a67da65ffd7d96748aa1605c3a03601df5ec8c55.tar.gz
xine-lib-a67da65ffd7d96748aa1605c3a03601df5ec8c55.tar.bz2
Remove the need for a result variable, simply return the value of the _parse_tag function. Solves one uninitialised variable use.
--HG-- extra : transplant_source : %9A._%DD%84%60SPH%3E%DF%D3%C0%D8y%9E-%BB%F1%C9
-rw-r--r--src/demuxers/id3.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c
index b5c07e419..4149c0512 100644
--- a/src/demuxers/id3.c
+++ b/src/demuxers/id3.c
@@ -854,27 +854,22 @@ int id3v2_parse_tag(input_plugin_t *input,
uint32_t id3_signature) {
_x_assert((id3_signature & ID3V2X_MASK) == ID3V2X_TAG);
- int result = 0;
-
switch(id3_signature) {
case ID3V22_TAG:
xprintf(stream->xine, XINE_VERBOSITY_LOG, "ID3V2.2 tag\n");
- result = id3v22_parse_tag(input, stream, id3_signature);
- break;
+ return id3v22_parse_tag(input, stream, id3_signature);
case ID3V23_TAG:
xprintf(stream->xine, XINE_VERBOSITY_LOG, "ID3V2.3 tag\n");
- result = id3v23_parse_tag(input, stream, id3_signature);
- break;
+ return id3v23_parse_tag(input, stream, id3_signature);
case ID3V24_TAG:
xprintf(stream->xine, XINE_VERBOSITY_LOG, "ID3V2.4 tag\n");
- result = id3v24_parse_tag(input, stream, id3_signature);
- break;
+ return id3v24_parse_tag(input, stream, id3_signature);
default:
xprintf(stream->xine, XINE_VERBOSITY_LOG, "Unknown ID3v2 signature: 0x%08x.\n", be2me_32(id3_signature));
}
-
- return result;
+
+ return 0;
}