[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/24] Use qemu_strdup() for VLANClientState string
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 05/24] Use qemu_strdup() for VLANClientState string fields |
Date: |
Wed, 23 Sep 2009 11:24:04 +0100 |
Signed-off-by: Mark McLoughlin <address@hidden>
---
net.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/net.c b/net.c
index 422ef4c..9a34030 100644
--- a/net.c
+++ b/net.c
@@ -296,7 +296,7 @@ static char *assign_name(VLANClientState *vc1, const char
*model)
snprintf(buf, sizeof(buf), "%s.%d", model, id);
- return strdup(buf);
+ return qemu_strdup(buf);
}
VLANClientState *qemu_new_vlan_client(VLANState *vlan,
@@ -310,9 +310,9 @@ VLANClientState *qemu_new_vlan_client(VLANState *vlan,
{
VLANClientState *vc, **pvc;
vc = qemu_mallocz(sizeof(VLANClientState));
- vc->model = strdup(model);
+ vc->model = qemu_strdup(model);
if (name)
- vc->name = strdup(name);
+ vc->name = qemu_strdup(name);
else
vc->name = assign_name(vc, model);
vc->can_receive = can_receive;
@@ -340,8 +340,8 @@ void qemu_del_vlan_client(VLANClientState *vc)
if (vc->cleanup) {
vc->cleanup(vc);
}
- free(vc->name);
- free(vc->model);
+ qemu_free(vc->name);
+ qemu_free(vc->model);
qemu_free(vc);
break;
} else
@@ -2127,8 +2127,8 @@ static int net_socket_listen_init(VLANState *vlan,
return -1;
}
s->vlan = vlan;
- s->model = strdup(model);
- s->name = name ? strdup(name) : NULL;
+ s->model = qemu_strdup(model);
+ s->name = name ? qemu_strdup(name) : NULL;
s->fd = fd;
qemu_set_fd_handler(fd, net_socket_accept, NULL, s);
return 0;
--
1.6.2.5
- [Qemu-devel] [PATCH 11/24] Add qemu_opts_validate() for post parsing validation, (continued)
- [Qemu-devel] [PATCH 11/24] Add qemu_opts_validate() for post parsing validation, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 02/24] Don't assign a static string to NICInfo::model, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 03/24] Make NICInfo string fields non-const, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 10/24] Make qemu_opts_parse() handle empty strings, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 09/24] Remove double error message for -device option parsing, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 13/24] Add qemu_net_opts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 23/24] Port PCI NIC hotplug to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 06/24] Fix coding style issue, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 08/24] Remove double error message in qemu_option_set(), Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 22/24] Port usb net to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 05/24] Use qemu_strdup() for VLANClientState string fields,
Mark McLoughlin <=
- [Qemu-devel] [PATCH 17/24] Port -net socket to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 15/24] Port -net user to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 07/24] Remove bogus error message from qemu_opts_set(), Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 16/24] Port -net tap to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 21/24] Port host_net_add monitor command to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 14/24] Port -net none and -net nic to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 24/24] Final net cleanup after conversion to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 18/24] Port -net vde to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 12/24] Never overwrite a QemuOpt, Mark McLoughlin, 2009/09/23