From 3916fe18d63d90cee3e8a9d73fcb135dc695e6f1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 25 Apr 2006 20:30:59 +0000 Subject: Remove redundant code. (g_key_file_get_group_comment): Don't dereference 2006-04-25 Matthias Clasen * glib/gkeyfile.c (g_key_file_lookup_group_node): Remove redundant code. (g_key_file_get_group_comment): Don't dereference before checking for NULL. (#338572, Coverity, Pascal Terjan) --- glib/gkeyfile.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'glib') diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c index 4456644cb..f6f295e31 100644 --- a/glib/gkeyfile.c +++ b/glib/gkeyfile.c @@ -2699,8 +2699,7 @@ g_key_file_get_group_comment (GKeyFile *key_file, GKeyFileGroup *group; group_node = g_key_file_lookup_group_node (key_file, group_name); - group = (GKeyFileGroup *)group_node->data; - if (!group) + if (!group_node) { g_set_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND, @@ -2710,6 +2709,7 @@ g_key_file_get_group_comment (GKeyFile *key_file, return NULL; } + group = (GKeyFileGroup *)group_node->data; if (group->comment) return g_strdup (group->comment->value); @@ -3119,15 +3119,12 @@ g_key_file_lookup_group_node (GKeyFile *key_file, GKeyFileGroup *group; GList *tmp; - group = NULL; for (tmp = key_file->groups; tmp != NULL; tmp = tmp->next) { group = (GKeyFileGroup *) tmp->data; if (group && group->name && strcmp (group->name, group_name) == 0) break; - - group = NULL; } return tmp; -- cgit v1.2.1