External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-07 18:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prefer VIR_STRDUP over virAsprintf(&dst, "%s", str)

Browse Source 
There's no sense in using virAsprintf() just to duplicate a string.
We should use VIR_STRDUP which is designed just for that.
This commit is contained in:
Michal Privoznik 2013-06-07 15:20:35 +02:00
parent cdd823c073
commit e463f4de77
6 changed files with 18 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/libvirtd-config.c
View File

@ -283,7 +283,7 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)
* running in disconnected operation, and report a less
* useful Avahi string
*/
ret = virAsprintf(&data->mdns_name, "Virtualization Host");
ret = VIR_STRDUP(data->mdns_name, "Virtualization Host");
} else {
char *tmp;
/* Extract the host part of the potentially FQDN */

2
src/conf/domain_audit.c
View File

@ -505,7 +505,7 @@ virDomainAuditRedirdev(virDomainObjPtr vm, virDomainRedirdevDefPtr redirdev,
switch (redirdev->bus) {
case VIR_DOMAIN_REDIRDEV_BUS_USB:
if (virAsprintf(&address, "USB redirdev") < 0) {
if (VIR_STRDUP_QUIET(address, "USB redirdev") < 0) {
VIR_WARN("OOM while encoding audit message");
goto cleanup;
}

30
src/libxl/libxl_driver.c
View File

@ -1191,29 +1191,23 @@ libxlStateInitialize(bool privileged,
if (!(libxl_driver->domains = virDomainObjListNew()))
goto error;
if (virAsprintf(&libxl_driver->configDir,
"%s", LIBXL_CONFIG_DIR) == -1)
goto out_of_memory;
if (VIR_STRDUP(libxl_driver->configDir, LIBXL_CONFIG_DIR) < 0)
goto error;
if (virAsprintf(&libxl_driver->autostartDir,
"%s", LIBXL_AUTOSTART_DIR) == -1)
goto out_of_memory;
if (VIR_STRDUP(libxl_driver->autostartDir, LIBXL_AUTOSTART_DIR) < 0)
goto error;
if (virAsprintf(&libxl_driver->logDir,
"%s", LIBXL_LOG_DIR) == -1)
goto out_of_memory;
if (VIR_STRDUP(libxl_driver->logDir, LIBXL_LOG_DIR) < 0)
goto error;
if (virAsprintf(&libxl_driver->stateDir,
"%s", LIBXL_STATE_DIR) == -1)
goto out_of_memory;
if (VIR_STRDUP(libxl_driver->stateDir, LIBXL_STATE_DIR) < 0)
goto error;
if (virAsprintf(&libxl_driver->libDir,
"%s", LIBXL_LIB_DIR) == -1)
goto out_of_memory;
if (VIR_STRDUP(libxl_driver->libDir, LIBXL_LIB_DIR) < 0)
goto error;
if (virAsprintf(&libxl_driver->saveDir,
"%s", LIBXL_SAVE_DIR) == -1)
goto out_of_memory;
if (VIR_STRDUP(libxl_driver->saveDir, LIBXL_SAVE_DIR) < 0)
goto error;
if (virFileMakePath(libxl_driver->logDir) < 0) {
VIR_ERROR(_("Failed to create log dir '%s': %s"),

2
src/nwfilter/nwfilter_ebiptables_driver.c
View File

@ -3008,7 +3008,7 @@ ebtablesCreateTmpSubChain(ebiptablesRuleInstPtr *inst,
ignore_value(VIR_STRDUP(protostr, ""));
break;
case L2_PROTO_STP_IDX:
ignore_value(virAsprintf(&protostr, "-d " NWFILTER_MAC_BGA " "));
ignore_value(VIR_STRDUP(protostr, "-d " NWFILTER_MAC_BGA " "));
break;
default:
ignore_value(virAsprintf(&protostr, "-p 0x%04x ",

8
src/phyp/phyp_driver.c
View File

@ -255,17 +255,11 @@ phypGetSystemType(virConnectPtr conn)
{
ConnectionData *connection_data = conn->networkPrivateData;
LIBSSH2_SESSION *session = connection_data->session;
char *cmd = NULL;
char *ret = NULL;
int exit_status = 0;
if (virAsprintf(&cmd, "lshmc -V") < 0) {
virReportOOMError();
return -1;
}
ret = phypExec(session, cmd, &exit_status, conn);
ret = phypExec(session, "lshmc -V", &exit_status, conn);
VIR_FREE(cmd);
VIR_FREE(ret);
return exit_status;
}

12
src/storage/storage_backend_scsi.c
View File

@ -498,7 +498,7 @@ virStorageBackendSCSIFindLUs(virStoragePoolObjPtr pool,
{
int retval = 0;
uint32_t bus, target, lun;
char *device_path = NULL;
const char *device_path = "/sys/bus/scsi/devices";
DIR *devicedir = NULL;
struct dirent *lun_dirent = NULL;
char devicepattern[64];
@ -507,18 +507,12 @@ virStorageBackendSCSIFindLUs(virStoragePoolObjPtr pool,
virFileWaitForDevices();
if (virAsprintf(&device_path, "/sys/bus/scsi/devices") < 0) {
virReportOOMError();
goto out;
}
devicedir = opendir(device_path);
if (devicedir == NULL) {
virReportSystemError(errno,
_("Failed to opendir path '%s'"), device_path);
retval = -1;
goto out;
return -1;
}
snprintf(devicepattern, sizeof(devicepattern), "%u:%%u:%%u:%%u\n", scanhost);
@ -536,8 +530,6 @@ virStorageBackendSCSIFindLUs(virStoragePoolObjPtr pool,
closedir(devicedir);
out:
VIR_FREE(device_path);
return retval;
}