External/libvirt
1
0
Fork 0
Code

conf: Rename virDomainDiskHostDefFree to virDomainDiskHostDefClear

Browse Source 
The function destroys only the contents not the object itself thus it
should be called Clear.
This commit is contained in:
Peter Krempa 2013-11-06 18:28:15 +01:00
parent 16bc786408
commit 2b2decbdcc
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/domain_conf.c
View File

@ -1217,13 +1217,13 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def)
} }
for (i = 0; i < def->nhosts; i++) for (i = 0; i < def->nhosts; i++)
virDomainDiskHostDefFree(&def->hosts[i]); virDomainDiskHostDefClear(&def->hosts[i]);
VIR_FREE(def->hosts); VIR_FREE(def->hosts);
VIR_FREE(def); VIR_FREE(def);
} }
void virDomainDiskHostDefFree(virDomainDiskHostDefPtr def) void virDomainDiskHostDefClear(virDomainDiskHostDefPtr def)
{ {
if (!def) if (!def)
return; return;
@ -4864,7 +4864,7 @@ error:
VIR_FREE(protocol); VIR_FREE(protocol);
VIR_FREE(transport); VIR_FREE(transport);
while (nhosts > 0) { while (nhosts > 0) {
virDomainDiskHostDefFree(&hosts[nhosts - 1]); virDomainDiskHostDefClear(&hosts[nhosts - 1]);
nhosts--; nhosts--;
} }

2
src/conf/domain_conf.h
View File

@ -2209,7 +2209,7 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def);
void virDomainInputDefFree(virDomainInputDefPtr def); void virDomainInputDefFree(virDomainInputDefPtr def);
void virDomainDiskDefFree(virDomainDiskDefPtr def); void virDomainDiskDefFree(virDomainDiskDefPtr def);
void virDomainLeaseDefFree(virDomainLeaseDefPtr def); void virDomainLeaseDefFree(virDomainLeaseDefPtr def);
void virDomainDiskHostDefFree(virDomainDiskHostDefPtr def); void virDomainDiskHostDefClear(virDomainDiskHostDefPtr def);
int virDomainDeviceFindControllerModel(virDomainDefPtr def, int virDomainDeviceFindControllerModel(virDomainDefPtr def,
virDomainDeviceInfoPtr info, virDomainDeviceInfoPtr info,
int controllerType); int controllerType);

2
src/libvirt_private.syms
View File

@ -197,7 +197,7 @@ virDomainDiskErrorPolicyTypeToString;
virDomainDiskFindByBusAndDst; virDomainDiskFindByBusAndDst;
virDomainDiskGeometryTransTypeFromString; virDomainDiskGeometryTransTypeFromString;
virDomainDiskGeometryTransTypeToString; virDomainDiskGeometryTransTypeToString;
virDomainDiskHostDefFree; virDomainDiskHostDefClear;
virDomainDiskIndexByName; virDomainDiskIndexByName;
virDomainDiskInsert; virDomainDiskInsert;
virDomainDiskInsertPreAlloced; virDomainDiskInsertPreAlloced;

4
src/qemu/qemu_command.c
View File

@ -3517,7 +3517,7 @@ cleanup:
return ret; return ret;
error: error:
virDomainDiskHostDefFree(def->hosts); virDomainDiskHostDefClear(def->hosts);
VIR_FREE(def->hosts); VIR_FREE(def->hosts);
goto cleanup; goto cleanup;
} }
@ -3619,7 +3619,7 @@ qemuParseNBDString(virDomainDiskDefPtr disk)
return 0; return 0;
error: error:
virDomainDiskHostDefFree(h); virDomainDiskHostDefClear(h);
VIR_FREE(h); VIR_FREE(h);
return -1; return -1;
} }