Mercurial > audlegacy
changeset 2660:8d0b89db56e5 trunk
[svn] - fixed c++ish declaration in a c file (part 7)
| author | giacomo |
|---|---|
| date | Sat, 07 Apr 2007 05:36:05 -0700 |
| parents | e3f584bba3be |
| children | f6c7271df7de |
| files | ChangeLog src/audacious/build_stamp.c src/audacious/util.c |
| diffstat | 3 files changed, 22 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Apr 07 05:29:39 2007 -0700 +++ b/ChangeLog Sat Apr 07 05:36:05 2007 -0700 @@ -1,3 +1,10 @@ +2007-04-07 12:29:39 +0000 Giacomo Lozito <james@develia.org> + revision [4344] + - fixed c++ish declaration in a c file (part 6) + trunk/src/audacious/ui_playlist_manager.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + 2007-04-07 12:25:22 +0000 Giacomo Lozito <james@develia.org> revision [4342] - fixed c++ish declaration in a c file (part 5)
--- a/src/audacious/build_stamp.c Sat Apr 07 05:29:39 2007 -0700 +++ b/src/audacious/build_stamp.c Sat Apr 07 05:36:05 2007 -0700 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070407-4342"; +const gchar *svn_stamp = "20070407-4344";
--- a/src/audacious/util.c Sat Apr 07 05:29:39 2007 -0700 +++ b/src/audacious/util.c Sat Apr 07 05:36:05 2007 -0700 @@ -378,9 +378,10 @@ static void strip_lower_string(GString *string) { + gchar *lower; strip_string(string); - gchar *lower = g_ascii_strdown(string->str, -1); + lower = g_ascii_strdown(string->str, -1); g_free(string->str); string->str = lower; } @@ -565,20 +566,26 @@ gchar * read_ini_string(INIFile *inifile, const gchar *section, const gchar *key) { + GString *section_string; + GString *key_string; + gchar *value = NULL; + gpointer section_hash, key_hash; + GHashTable *section_table; + g_return_val_if_fail(inifile, NULL); - GString *section_string = g_string_new(section); - GString *key_string = g_string_new(key); - gchar *value = NULL; + section_string = g_string_new(section); + key_string = g_string_new(key); + value = NULL; strip_lower_string(section_string); strip_lower_string(key_string); - gpointer section_hash = GINT_TO_POINTER(g_string_hash(section_string)); - gpointer key_hash = GINT_TO_POINTER(g_string_hash(key_string)); + section_hash = GINT_TO_POINTER(g_string_hash(section_string)); + key_hash = GINT_TO_POINTER(g_string_hash(key_string)); g_string_free(section_string, FALSE); g_string_free(key_string, FALSE); - GHashTable *section_table = g_hash_table_lookup(inifile, section_hash); + section_table = g_hash_table_lookup(inifile, section_hash); g_return_val_if_fail(section_table, NULL); value = g_hash_table_lookup(section_table, GINT_TO_POINTER(key_hash));