From 25cf3333551c59ae518b1ecc4e68197ff1766670 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 14 Jan 2009 23:09:36 +0100 Subject: oggvorbis: use vorbis_comment_value() in vorbis_parse_comment() Eliminate some duplicate code. --- src/decoder/oggvorbis_plugin.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/decoder') diff --git a/src/decoder/oggvorbis_plugin.c b/src/decoder/oggvorbis_plugin.c index 60ad0d07c..772526225 100644 --- a/src/decoder/oggvorbis_plugin.c +++ b/src/decoder/oggvorbis_plugin.c @@ -144,8 +144,7 @@ static const char *VORBIS_COMMENT_DISC_KEY = "discnumber"; static bool vorbis_parse_comment(struct tag *tag, char *comment, enum tag_type tag_type) { - const char *needle; - unsigned int len; + const char *needle, *value; assert(tag != NULL); @@ -159,10 +158,10 @@ vorbis_parse_comment(struct tag *tag, char *comment, enum tag_type tag_type) default: needle = mpdTagItemKeys[tag_type]; } - len = strlen(needle); - if (strncasecmp(comment, needle, len) == 0 && *(comment + len) == '=') { - tag_add_item(tag, tag_type, comment + len + 1); + value = vorbis_comment_value(comment, needle); + if (value != NULL) { + tag_add_item(tag, tag_type, value); return true; } -- cgit v1.2.3