[libvirt PATCH v2 18/24] storage: replace VIR_FREE with g_free in all vir*Free() functions

Signed-off-by: Laine Stump <laine(a)redhat.com&gt; --- src/storage/storage_backend_fs.c | 6 +++--- src/storage/storage_backend_rbd.c | 10 +++++----- src/storage/storage_backend_scsi.c | 4 ++-- src/storage/storage_driver.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index b98d06c644..48924167eb 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -551,10 +551,10 @@ virStoragePoolDefFSNamespaceFree(void *nsdata) return; for (i = 0; i < cmdopts->noptions; i++) - VIR_FREE(cmdopts->options[i]); - VIR_FREE(cmdopts->options); + g_free(cmdopts->options[i]); + g_free(cmdopts->options); - VIR_FREE(cmdopts); + g_free(cmdopts); } diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 007c53f7ac..2804759557 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -68,13 +68,13 @@ virStoragePoolDefRBDNamespaceFree(void *nsdata) return; for (i = 0; i < cmdopts->noptions; i++) { - VIR_FREE(cmdopts->names[i]); - VIR_FREE(cmdopts->values[i]); + g_free(cmdopts->names[i]); + g_free(cmdopts->values[i]); } - VIR_FREE(cmdopts->names); - VIR_FREE(cmdopts->values); + g_free(cmdopts->names); + g_free(cmdopts->values); - VIR_FREE(cmdopts); + g_free(cmdopts); } diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 69a01d1a24..9474c60c72 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -95,8 +95,8 @@ virStoragePoolFCRefreshDataFree(void *opaque) { virStoragePoolFCRefreshInfoPtr cbdata = opaque; - VIR_FREE(cbdata->fchost_name); - VIR_FREE(cbdata); + g_free(cbdata->fchost_name); + g_free(cbdata); } /** diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 16bc53aa46..9c5be071df 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2268,8 +2268,8 @@ virStorageVolPoolRefreshDataFree(void *opaque) { virStorageVolStreamInfoPtr cbdata = opaque; - VIR_FREE(cbdata->pool_name); - VIR_FREE(cbdata); + g_free(cbdata->pool_name); + g_free(cbdata); } static int -- 2.29.2