# HG changeset patch # User ib # Date 1330104395 0 # Node ID 311b47301ea72b5b0d8d5be1fec01e8ab325e24e # Parent b0348125351870f785a874e82025a2bd2bccb1f6 Remove gstrcasecmp(). This function isn't necessary. strcasecmp() can be used just as well, because both arguments to the gstrcasecmp() calls have been checked to be not NULL prior to the call. diff -r b03481253518 -r 311b47301ea7 gui/ui/gtk/preferences.c --- a/gui/ui/gtk/preferences.c Fri Feb 24 17:16:54 2012 +0000 +++ b/gui/ui/gtk/preferences.c Fri Feb 24 17:26:35 2012 +0000 @@ -319,7 +319,7 @@ { int i; for ( i=0;lEncoding[i].name;i++ ) - if ( !gstrcasecmp( sub_cp,lEncoding[i].name ) ) break; + if ( !strcasecmp( sub_cp,lEncoding[i].name ) ) break; if ( lEncoding[i].name ) gtk_entry_set_text( GTK_ENTRY( ESubEncoding ),lEncoding[i].comment ); } #endif @@ -338,7 +338,7 @@ { int i; for ( i=0;lEncoding[i].name;i++ ) - if ( !gstrcasecmp( subtitle_font_encoding,lEncoding[i].name ) ) break; + if ( !strcasecmp( subtitle_font_encoding,lEncoding[i].name ) ) break; if ( lEncoding[i].name ) gtk_entry_set_text( GTK_ENTRY( EFontEncoding ),lEncoding[i].comment ); } switch ( subtitle_autoscale ) diff -r b03481253518 -r 311b47301ea7 gui/util/string.c --- a/gui/util/string.c Fri Feb 24 17:16:54 2012 +0000 +++ b/gui/util/string.c Fri Feb 24 17:26:35 2012 +0000 @@ -163,16 +163,6 @@ return strcmp(a, b); } -int gstrcasecmp(const char *a, const char *b) -{ - if (!a && !b) - return 0; - if (!a || !b) - return -1; - - return strcasecmp(a, b); -} - /** * @brief A strncmp() that can handle NULL pointers. * diff -r b03481253518 -r 311b47301ea7 gui/util/string.h --- a/gui/util/string.h Fri Feb 24 17:16:54 2012 +0000 +++ b/gui/util/string.h Fri Feb 24 17:26:35 2012 +0000 @@ -23,7 +23,6 @@ char *decomment(char *in); char *fgetstr(char *str, int size, FILE *file); -int gstrcasecmp(const char *a, const char *b); char *gstrchr(const char *str, int c); int gstrcmp(const char *a, const char *b); char *gstrdup(const char *str);