diff options
| author | John Ferlan <jferlan@redhat.com> | 2017-03-02 13:18:32 -0500 |
|---|---|---|
| committer | John Ferlan <jferlan@redhat.com> | 2017-03-07 13:27:25 -0500 |
| commit | 62bc95678613221ca3d5398e3908cc01e5b19563 (patch) | |
| tree | ba1e642dd056d694260faa6ebab63e216404f0d9 /src/nwfilter | |
| parent | 44242cce0289ccd4575303485db9377e000eed45 (diff) | |
| download | libvirt-62bc95678613221ca3d5398e3908cc01e5b19563.tar.gz | |
conf: Use consistent function name prefixes for virnwfilterobj
Use "virNWFilterObj" as a prefix for any external API in virnwfilterobj
Diffstat (limited to 'src/nwfilter')
| -rw-r--r-- | src/nwfilter/nwfilter_driver.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 6ce2bfd6c7..4ea216a59c 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -237,8 +237,7 @@ nwfilterStateInitialize(bool privileged, VIR_FREE(base); - if (virNWFilterLoadAllConfigs(&driver->nwfilters, - driver->configDir) < 0) + if (virNWFilterObjLoadAllConfigs(&driver->nwfilters, driver->configDir) < 0) goto error; nwfilterDriverUnlock(); @@ -290,8 +289,7 @@ nwfilterStateReload(void) virNWFilterWriteLockFilterUpdates(); virNWFilterCallbackDriversLock(); - virNWFilterLoadAllConfigs(&driver->nwfilters, - driver->configDir); + virNWFilterObjLoadAllConfigs(&driver->nwfilters, driver->configDir); virNWFilterCallbackDriversUnlock(); virNWFilterUnlockFilterUpdates(); @@ -595,7 +593,7 @@ nwfilterUndefine(virNWFilterPtr obj) if (virNWFilterUndefineEnsureACL(obj->conn, nwfilter->def) < 0) goto cleanup; - if (virNWFilterTestUnassignDef(nwfilter) < 0) { + if (virNWFilterObjTestUnassignDef(nwfilter) < 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("nwfilter is in use")); |