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

Remove virConnectPtr arg from virNWFilterDefParse*

Browse Source 
None of the virNWFilterDefParse* methods require a virConnectPtr
arg, so just drop it

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-10-03 12:35:34 +01:00
parent 609eb987c6
commit b77b16ce41
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/conf/nwfilter_conf.c
View File

@ -2634,8 +2634,7 @@ cleanup:
static virNWFilterDefPtr static virNWFilterDefPtr
virNWFilterDefParse(virConnectPtr conn ATTRIBUTE_UNUSED, virNWFilterDefParse(const char *xmlStr,
const char *xmlStr,
const char *filename) { const char *filename) {
virNWFilterDefPtr def = NULL; virNWFilterDefPtr def = NULL;
xmlDocPtr xml; xmlDocPtr xml;
@ -2650,18 +2649,16 @@ virNWFilterDefParse(virConnectPtr conn ATTRIBUTE_UNUSED,
virNWFilterDefPtr virNWFilterDefPtr
virNWFilterDefParseString(virConnectPtr conn, virNWFilterDefParseString(const char *xmlStr)
const char *xmlStr)
{ {
return virNWFilterDefParse(conn, xmlStr, NULL); return virNWFilterDefParse(xmlStr, NULL);
} }
virNWFilterDefPtr virNWFilterDefPtr
virNWFilterDefParseFile(virConnectPtr conn, virNWFilterDefParseFile(const char *filename)
const char *filename)
{ {
return virNWFilterDefParse(conn, NULL, filename); return virNWFilterDefParse(NULL, filename);
} }
@ -3056,7 +3053,7 @@ virNWFilterObjLoad(virConnectPtr conn,
virNWFilterDefPtr def; virNWFilterDefPtr def;
virNWFilterObjPtr nwfilter; virNWFilterObjPtr nwfilter;
if (!(def = virNWFilterDefParseFile(conn, path))) { if (!(def = virNWFilterDefParseFile(path))) {
return NULL; return NULL;
} }

6
src/conf/nwfilter_conf.h
View File

@ -713,10 +713,8 @@ int virNWFilterLoadAllConfigs(virConnectPtr conn,
char *virNWFilterConfigFile(const char *dir, char *virNWFilterConfigFile(const char *dir,
const char *name); const char *name);
virNWFilterDefPtr virNWFilterDefParseString(virConnectPtr conn, virNWFilterDefPtr virNWFilterDefParseString(const char *xml);
const char *xml); virNWFilterDefPtr virNWFilterDefParseFile(const char *filename);
virNWFilterDefPtr virNWFilterDefParseFile(virConnectPtr conn,
const char *filename);
void virNWFilterObjLock(virNWFilterObjPtr obj); void virNWFilterObjLock(virNWFilterObjPtr obj);
void virNWFilterObjUnlock(virNWFilterObjPtr obj); void virNWFilterObjUnlock(virNWFilterObjPtr obj);

2
src/nwfilter/nwfilter_driver.c
View File

@ -566,7 +566,7 @@ nwfilterDefineXML(virConnectPtr conn,
nwfilterDriverLock(driver); nwfilterDriverLock(driver);
virNWFilterCallbackDriversLock(); virNWFilterCallbackDriversLock();
if (!(def = virNWFilterDefParseString(conn, xml))) if (!(def = virNWFilterDefParseString(xml)))
goto cleanup; goto cleanup;
if (virNWFilterDefineXMLEnsureACL(conn, def) < 0) if (virNWFilterDefineXMLEnsureACL(conn, def) < 0)

2
tests/nwfilterxml2xmltest.c
View File

@ -36,7 +36,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml,
virResetLastError(); virResetLastError();
if (!(dev = virNWFilterDefParseString(NULL, inXmlData))) { if (!(dev = virNWFilterDefParseString(inXmlData))) {
if (expect_error) { if (expect_error) {
virResetLastError(); virResetLastError();
goto done; goto done;