diff options
author | zhanghailiang <zhang.zhanghailiang@huawei.com> | 2014-08-18 15:49:22 +0800 |
---|---|---|
committer | Michael Tokarev <mjt@tls.msk.ru> | 2014-08-24 13:16:32 +0400 |
commit | bc5008a832f95aae86efce844382e64d54da2146 (patch) | |
tree | 2c5677d36417aee291091dd0dad60fb1eeb4f1e6 /util/path.c | |
parent | 33886ebeec0c0ff6253a49253fae0db44c9ed0f3 (diff) | |
download | qemu-bc5008a832f95aae86efce844382e64d54da2146.zip qemu-bc5008a832f95aae86efce844382e64d54da2146.tar.gz qemu-bc5008a832f95aae86efce844382e64d54da2146.tar.bz2 |
util/path: Use the GLib memory allocation routines
In this file, we don't check the return value of malloc/strdup/realloc which may fail.
Instead of using these routines, we use the GLib memory APIs g_malloc/g_strdup/g_realloc.
They will exit on allocation failure, so there is no need to test for failure,
which would be fine for setup.
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'util/path.c')
-rw-r--r-- | util/path.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/util/path.c b/util/path.c index 5c59d9f..4e4877e 100644 --- a/util/path.c +++ b/util/path.c @@ -45,8 +45,8 @@ static struct pathelem *new_entry(const char *root, struct pathelem *parent, const char *name) { - struct pathelem *new = malloc(sizeof(*new)); - new->name = strdup(name); + struct pathelem *new = g_malloc(sizeof(*new)); + new->name = g_strdup(name); new->pathname = g_strdup_printf("%s/%s", root, name); new->num_entries = 0; return new; @@ -88,7 +88,7 @@ static struct pathelem *add_entry(struct pathelem *root, const char *name, root->num_entries++; - root = realloc(root, sizeof(*root) + root = g_realloc(root, sizeof(*root) + sizeof(root->entries[0])*root->num_entries); e = &root->entries[root->num_entries-1]; @@ -161,8 +161,8 @@ void init_paths(const char *prefix) base = add_dir_maybe(base); if (base->num_entries == 0) { g_free(base->pathname); - free(base->name); - free(base); + g_free(base->name); + g_free(base); base = NULL; } else { set_parents(base, base); |