From ca08c4dbf42bdf459be51f4a3955a39aa813a8d6 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 31 May 2010 00:06:37 +0200 Subject: decoder/vorbis: rename local variable "ret" --- src/decoder/vorbis_decoder_plugin.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/decoder/vorbis_decoder_plugin.c b/src/decoder/vorbis_decoder_plugin.c index 6cbce85be..9e63831ef 100644 --- a/src/decoder/vorbis_decoder_plugin.c +++ b/src/decoder/vorbis_decoder_plugin.c @@ -373,22 +373,21 @@ vorbis_stream_decode(struct decoder *decoder, static struct tag * vorbis_stream_tag(struct input_stream *is) { - struct tag *ret; struct vorbis_input_stream vis; OggVorbis_File vf; if (!vorbis_is_open(&vis, &vf, NULL, is)) return NULL; - ret = vorbis_comments_to_tag(ov_comment(&vf, -1)->user_comments); + struct tag *tag = vorbis_comments_to_tag(ov_comment(&vf, -1)->user_comments); - if (!ret) - ret = tag_new(); - ret->time = (int)(ov_time_total(&vf, -1) + 0.5); + if (tag == NULL) + tag = tag_new(); + tag->time = (int)(ov_time_total(&vf, -1) + 0.5); ov_clear(&vf); - return ret; + return tag; } static const char *const vorbis_suffixes[] = { -- cgit v1.2.3