External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Rename variable in virStorageSourceNewFromBackingAbsolute

Browse Source 
To prepare for subsequent change to use VIR_AUTOPTR logic rename
the @ret to @def.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
John Ferlan 2019-02-08 08:31:51 -05:00
parent a2cdee57d2
commit c856f72251
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/util/virstoragefile.c
View File

@ -3632,48 +3632,48 @@ virStorageSourcePtr
virStorageSourceNewFromBackingAbsolute(const char *path)
{
const char *json;
virStorageSourcePtr ret;
virStorageSourcePtr def;
int rc;
if (VIR_ALLOC(ret) < 0)
if (VIR_ALLOC(def) < 0)
return NULL;
if (virStorageIsFile(path)) {
ret->type = VIR_STORAGE_TYPE_FILE;
def->type = VIR_STORAGE_TYPE_FILE;
if (VIR_STRDUP(ret->path, path) < 0)
if (VIR_STRDUP(def->path, path) < 0)
goto error;
} else {
ret->type = VIR_STORAGE_TYPE_NETWORK;
def->type = VIR_STORAGE_TYPE_NETWORK;
VIR_DEBUG("parsing backing store string: '%s'", path);
/* handle URI formatted backing stores */
if ((json = STRSKIP(path, "json:")))
rc = virStorageSourceParseBackingJSON(ret, json);
rc = virStorageSourceParseBackingJSON(def, json);
else if (strstr(path, "://"))
rc = virStorageSourceParseBackingURI(ret, path);
rc = virStorageSourceParseBackingURI(def, path);
else
rc = virStorageSourceParseBackingColon(ret, path);
rc = virStorageSourceParseBackingColon(def, path);
if (rc < 0)
goto error;
virStorageSourceNetworkAssignDefaultPorts(ret);
virStorageSourceNetworkAssignDefaultPorts(def);
/* Some of the legacy parsers parse authentication data since they are
* also used in other places. For backing store detection the
* authentication data would be invalid anyways, so we clear it */
if (ret->auth) {
virStorageAuthDefFree(ret->auth);
ret->auth = NULL;
if (def->auth) {
virStorageAuthDefFree(def->auth);
def->auth = NULL;
}
}
return ret;
return def;
error:
virStorageSourceFree(ret);
virStorageSourceFree(def);
return NULL;
}