diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-04-25 20:30:59 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-04-25 20:30:59 +0000 |
| commit | 3916fe18d63d90cee3e8a9d73fcb135dc695e6f1 (patch) | |
| tree | 93d62b1a335b2f2a6da69ebf7b86d45bab370bcb /glib | |
| parent | 5dd378d2bda2d8bf48cb5b04ae97c6622fa06ddf (diff) | |
| download | glib-3916fe18d63d90cee3e8a9d73fcb135dc695e6f1.tar.gz | |
Remove redundant code. (g_key_file_get_group_comment): Don't dereference
2006-04-25 Matthias Clasen <mclasen@redhat.com>
* 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)
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/gkeyfile.c | 7 |
1 files changed, 2 insertions, 5 deletions
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; |