Mercurial > audlegacy
changeset 228:08973a746a3e trunk
[svn] GCC2 fixes.
| author | nenolod |
|---|---|
| date | Fri, 25 Nov 2005 23:14:41 -0800 |
| parents | 539a0fa7f030 |
| children | 108cd7e58d5e |
| files | Plugins/Input/mpg123/id3_frame_content.c Plugins/Input/mpg123/id3_frame_text.c Plugins/Input/mpg123/id3_frame_url.c |
| diffstat | 3 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/Plugins/Input/mpg123/id3_frame_content.c Fri Nov 25 20:23:40 2005 -0800 +++ b/Plugins/Input/mpg123/id3_frame_content.c Fri Nov 25 23:14:41 2005 -0800 @@ -46,6 +46,7 @@ id3_get_content(struct id3_frame *frame) { gchar *text, *text_it; + guint8 encoding; /* Type check */ if (frame->fr_desc->fd_id != ID3_TCON) @@ -56,8 +57,6 @@ return NULL; ID3_FRAME_DEFINE_CURSOR(frame); - - guint8 encoding; ID3_FRAME_READ_OR_RETVAL(encoding, NULL); text = text_it = id3_string_decode(encoding, cursor, length);
--- a/Plugins/Input/mpg123/id3_frame_text.c Fri Nov 25 20:23:40 2005 -0800 +++ b/Plugins/Input/mpg123/id3_frame_text.c Fri Nov 25 23:14:41 2005 -0800 @@ -44,6 +44,8 @@ gint8 id3_get_encoding(struct id3_frame * frame) { + guint8 encoding; + /* Type check */ if (!id3_frame_is_text(frame) && frame->fr_desc->fd_id != ID3_WXXX && @@ -63,8 +65,6 @@ return -1; ID3_FRAME_DEFINE_CURSOR(frame); - - guint8 encoding; ID3_FRAME_READ_OR_RETVAL(encoding, -1); return encoding; @@ -260,6 +260,8 @@ char * id3_get_text_desc(struct id3_frame *frame) { + guint8 encoding; + /* Type check */ if (frame->fr_desc->fd_idstr[0] != 'T') return NULL; @@ -273,8 +275,6 @@ return NULL; ID3_FRAME_DEFINE_CURSOR(frame); - - guint8 encoding; ID3_FRAME_READ_OR_RETVAL(encoding, NULL); return id3_string_decode(encoding, cursor, length); @@ -291,6 +291,7 @@ int id3_get_text_number(struct id3_frame *frame) { + guint8 encoding; int number = 0; /* Check if frame is compressed */ @@ -298,8 +299,6 @@ return -1; ID3_FRAME_DEFINE_CURSOR(frame); - - guint8 encoding; ID3_FRAME_READ_OR_RETVAL(encoding, number); gchar* number_str = id3_string_decode(encoding, cursor, length);
--- a/Plugins/Input/mpg123/id3_frame_url.c Fri Nov 25 20:23:40 2005 -0800 +++ b/Plugins/Input/mpg123/id3_frame_url.c Fri Nov 25 23:14:41 2005 -0800 @@ -79,6 +79,8 @@ char * id3_get_url_desc(struct id3_frame *frame) { + guint8 encoding; + /* Type check */ if ( frame->fr_desc->fd_idstr[0] != 'W' ) return NULL; @@ -92,8 +94,6 @@ return NULL; ID3_FRAME_DEFINE_CURSOR(frame); - - guint8 encoding; ID3_FRAME_READ_OR_RETVAL(encoding, NULL); return id3_string_decode(encoding, cursor, length);