提交 2b2decbd 编写于 作者: P Peter Krempa

conf: Rename virDomainDiskHostDefFree to virDomainDiskHostDefClear

The function destroys only the contents not the object itself thus it
should be called Clear.
上级 16bc7864
......@@ -1217,13 +1217,13 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def)
}
for (i = 0; i < def->nhosts; i++)
virDomainDiskHostDefFree(&def->hosts[i]);
virDomainDiskHostDefClear(&def->hosts[i]);
VIR_FREE(def->hosts);
VIR_FREE(def);
}
void virDomainDiskHostDefFree(virDomainDiskHostDefPtr def)
void virDomainDiskHostDefClear(virDomainDiskHostDefPtr def)
{
if (!def)
return;
......@@ -4864,7 +4864,7 @@ error:
VIR_FREE(protocol);
VIR_FREE(transport);
while (nhosts > 0) {
virDomainDiskHostDefFree(&hosts[nhosts - 1]);
virDomainDiskHostDefClear(&hosts[nhosts - 1]);
nhosts--;
}
......
......@@ -2209,7 +2209,7 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def);
void virDomainInputDefFree(virDomainInputDefPtr def);
void virDomainDiskDefFree(virDomainDiskDefPtr def);
void virDomainLeaseDefFree(virDomainLeaseDefPtr def);
void virDomainDiskHostDefFree(virDomainDiskHostDefPtr def);
void virDomainDiskHostDefClear(virDomainDiskHostDefPtr def);
int virDomainDeviceFindControllerModel(virDomainDefPtr def,
virDomainDeviceInfoPtr info,
int controllerType);
......
......@@ -197,7 +197,7 @@ virDomainDiskErrorPolicyTypeToString;
virDomainDiskFindByBusAndDst;
virDomainDiskGeometryTransTypeFromString;
virDomainDiskGeometryTransTypeToString;
virDomainDiskHostDefFree;
virDomainDiskHostDefClear;
virDomainDiskIndexByName;
virDomainDiskInsert;
virDomainDiskInsertPreAlloced;
......
......@@ -3517,7 +3517,7 @@ cleanup:
return ret;
error:
virDomainDiskHostDefFree(def->hosts);
virDomainDiskHostDefClear(def->hosts);
VIR_FREE(def->hosts);
goto cleanup;
}
......@@ -3619,7 +3619,7 @@ qemuParseNBDString(virDomainDiskDefPtr disk)
return 0;
error:
virDomainDiskHostDefFree(h);
virDomainDiskHostDefClear(h);
VIR_FREE(h);
return -1;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册