[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/11] util/path: Use the GLib memory allocation rout
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 01/11] util/path: Use the GLib memory allocation routines |
Date: |
Sun, 24 Aug 2014 17:30:52 +0400 |
From: zhanghailiang <address@hidden>
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 <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
util/path.c | 10 +++++-----
1 file 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);
--
1.7.10.4
- [Qemu-devel] [PULL 00/11] Trivial patches for 2014-08-24, Michael Tokarev, 2014/08/24
- [Qemu-devel] [PULL 09/11] linux-user: fix file descriptor leaks, Michael Tokarev, 2014/08/24
- [Qemu-devel] [PULL 03/11] tests/bios-tables-test: check the value returned by fopen(), Michael Tokarev, 2014/08/24
- [Qemu-devel] [PULL 06/11] configure: no need to mkdir QMP, Michael Tokarev, 2014/08/24
- [Qemu-devel] [PULL 02/11] tcg: dump op count into qemu log, Michael Tokarev, 2014/08/24
- [Qemu-devel] [PULL 10/11] libdecnumber: Fix warnings from smatch (missing static, boolean operations), Michael Tokarev, 2014/08/24
- [Qemu-devel] [PULL 01/11] util/path: Use the GLib memory allocation routines,
Michael Tokarev <=
- [Qemu-devel] [PULL 07/11] slirp/misc: Use the GLib memory allocation APIs, Michael Tokarev, 2014/08/24
- [Qemu-devel] [PULL 11/11] vmxnet3: Pad short frames to minimum size (60 bytes), Michael Tokarev, 2014/08/24
- [Qemu-devel] [PULL 08/11] po: Fix Makefile rules for in-tree builds without configuration, Michael Tokarev, 2014/08/24
- [Qemu-devel] [PULL 05/11] dma: axidma: Variablise repeated s->streams[i] sub-expr, Michael Tokarev, 2014/08/24
- [Qemu-devel] [PULL 04/11] microblaze: ml605: Get rid of ddr_base variable, Michael Tokarev, 2014/08/24
- Re: [Qemu-devel] [PULL 00/11] Trivial patches for 2014-08-24, Peter Maydell, 2014/08/25