Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11863/src
Modified Files:
mp3file.c
Log Message:
* src/mp3file.c: fixed "comparison with string literal" issues
by using strcmp instead. Thanks to Petr Gajdos.
Index: mp3file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/mp3file.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- mp3file.c 27 Sep 2006 14:22:13 -0000 1.73
+++ mp3file.c 19 Apr 2007 11:20:42 -0000 1.74
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-09-27 22:38:49 jcs>
+/* Time-stamp: <2007-04-19 20:18:03 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -1156,7 +1156,7 @@
if (!string) return NULL;
- if (frame_name == ID3_FRAME_GENRE)
+ if (strcmp (frame_name, ID3_FRAME_GENRE) == 0)
string = id3_genre_name (string);
if (encoding == ID3_FIELD_TEXTENCODING_ISO_8859_1)
@@ -1206,7 +1206,7 @@
field = id3_frame_field (frame, 0);
id3_field_settextencoding(field, encoding);
- if (frame_name == ID3_FRAME_COMMENT)
+ if (strcmp (frame_name, ID3_FRAME_COMMENT) == 0)
{
field = id3_frame_field (frame, 3);
field->type = ID3_FIELD_TYPE_STRINGFULL;
@@ -1221,7 +1221,7 @@
/* maybe could be optimized see
http://www.mars.org/mailman/public/mad-dev/2002-October/000739.html
*/
- if (frame_name == ID3_FRAME_GENRE)
+ if (strcmp (frame_name, ID3_FRAME_GENRE) == 0)
{
id3_ucs4_t *tmp_ucs4 = id3_utf8_ucs4duplicate ((id3_utf8_t *)data);
int index = id3_genre_number (tmp_ucs4);
@@ -1271,7 +1271,7 @@
}
}
- if (frame_name == ID3_FRAME_COMMENT)
+ if (strcmp (frame_name, ID3_FRAME_COMMENT) == 0)
res = id3_field_setfullstring (field, ucs4);
else
res = id3_field_setstrings (field, 1, &ucs4);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
