[libvirt] [PATCH 1/3] conf: rename structs used by Export function

[Anya Harter]

to be the name of the Export function followed by Data

ex. for virInterfaceObjListExport, the struct is named
virInterfaceObjListExportData

Signed-off-by: Anya Harter 
---
 src/conf/virinterfaceobj.c |  6 +++---
 src/conf/virnetworkobj.c   |  6 +++---
 src/conf/virsecretobj.c|  6 +++---
 src/conf/virstorageobj.c   | 12 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c
index b0c4ca15a1..10a291e911 100644
--- a/src/conf/virinterfaceobj.c
+++ b/src/conf/virinterfaceobj.c
@@ -260,7 +260,7 @@ virInterfaceObjMatch(virInterfaceObjPtr obj,
 #undef MATCH
 
 
-struct virInterfaceObjListData {
+struct virInterfaceObjListExportData {
 virConnectPtr conn;
 virInterfacePtr *ifaces;
 virInterfaceObjListFilter filter;
@@ -274,7 +274,7 @@ virInterfaceObjListPopulate(void *payload,
 const void *name ATTRIBUTE_UNUSED,
 void *opaque)
 {
-struct virInterfaceObjListData *data = opaque;
+struct virInterfaceObjListExportData *data = opaque;
 virInterfaceObjPtr obj = payload;
 virInterfacePtr iface = NULL;
 
@@ -316,7 +316,7 @@ virInterfaceObjListExport(virConnectPtr conn,
   unsigned int flags)
 {
 int ret = -1;
-struct virInterfaceObjListData data = {
+struct virInterfaceObjListExportData data = {
 .conn = conn, .ifaces = NULL, .filter = filter, .flags = flags,
 .nifaces = 0, .error = false };
 
diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index e00c8a7f6c..cc55b4806d 100644
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -1304,7 +1304,7 @@ virNetworkMatch(virNetworkObjPtr obj,
 #undef MATCH
 
 
-struct virNetworkObjListData {
+struct virNetworkObjListExportData {
 virConnectPtr conn;
 virNetworkPtr *nets;
 virNetworkObjListFilter filter;
@@ -1318,7 +1318,7 @@ virNetworkObjListPopulate(void *payload,
   const void *name ATTRIBUTE_UNUSED,
   void *opaque)
 {
-struct virNetworkObjListData *data = opaque;
+struct virNetworkObjListExportData *data = opaque;
 virNetworkObjPtr obj = payload;
 virNetworkPtr net = NULL;
 
@@ -1360,7 +1360,7 @@ virNetworkObjListExport(virConnectPtr conn,
 unsigned int flags)
 {
 int ret = -1;
-struct virNetworkObjListData data = {
+struct virNetworkObjListExportData data = {
 .conn = conn, .nets = NULL, .filter = filter, .flags = flags,
 .nnets = 0, .error = false };
 
diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c
index 48ce3c8141..ba360810f4 100644
--- a/src/conf/virsecretobj.c
+++ b/src/conf/virsecretobj.c
@@ -526,7 +526,7 @@ virSecretObjMatchFlags(virSecretObjPtr obj,
 #undef MATCH
 
 
-struct virSecretObjListData {
+struct virSecretObjListExportData {
 virConnectPtr conn;
 virSecretPtr *secrets;
 virSecretObjListACLFilter filter;
@@ -540,7 +540,7 @@ virSecretObjListExportCallback(void *payload,
const void *name ATTRIBUTE_UNUSED,
void *opaque)
 {
-struct virSecretObjListData *data = opaque;
+struct virSecretObjListExportData *data = opaque;
 virSecretObjPtr obj = payload;
 virSecretDefPtr def;
 virSecretPtr secret = NULL;
@@ -584,7 +584,7 @@ virSecretObjListExport(virConnectPtr conn,
virSecretObjListACLFilter filter,
unsigned int flags)
 {
-struct virSecretObjListData data = {
+struct virSecretObjListExportData data = {
 .conn = conn, .secrets = NULL,
 .filter = filter, .flags = flags,
 .nsecrets = 0, .error = false };
diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index e66b2ebfb2..bbf707f2f9 100644
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -960,7 +960,7 @@ virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj,
 }
 
 
-struct _virStorageVolObjExportData {
+struct virStoragePoolObjVolumeListExportData {
 virConnectPtr conn;
 virStoragePoolVolumeACLFilter filter;
 virStoragePoolDefPtr pooldef;
@@ -975,7 +975,7 @@ virStoragePoolObjVolumeListExportCb(void *payload,
 void *opaque)
 {
 virStorageVolObjPtr volobj = payload;
-struct _virStorageVolObjExportData *data = opaque;
+struct virStoragePoolObjVolumeListExportData *data = opaque;
 virStorageVolPtr vol = NULL;
 
 if (data->error)
@@ -1012,7 +1012,7 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn,
   virStoragePoolVolumeACLFilter filter)
 {
 virStorageVolObjListPtr volumes = obj->volumes;
-struct _virStorageVolObjExportData data = {
+struct virStoragePoolObjVolumeListExportData data = {
 .conn = conn, .filter = filter, .pooldef = obj->def, .error = false,
 .nvols = 0, .vols = NULL };
 
@

Re: [libvirt] [PATCH 1/3] conf: rename structs used by Export function

[Andrea Bolognani]

On Mon, 2018-07-30 at 10:07 -0400, Anya Harter wrote:
> conf: rename structs used by Export function
> 
> to be the name of the Export function followed by Data
> 
> ex. for virInterfaceObjListExport, the struct is named
> virInterfaceObjListExportData

The title and body of the commit message should be able to stand
on their own as complete sentences, so you'll have to rework the
latter.

[...]
> -struct virInterfaceObjListData {
> +struct virInterfaceObjListExportData {
>  virConnectPtr conn;
>  virInterfacePtr *ifaces;
>  virInterfaceObjListFilter filter;
> @@ -274,7 +274,7 @@ virInterfaceObjListPopulate(void *payload,
>  const void *name ATTRIBUTE_UNUSED,
>  void *opaque)
>  {
> -struct virInterfaceObjListData *data = opaque;
> +struct virInterfaceObjListExportData *data = opaque;

This is kind of a weird pattern in the context of libvirt: most
structs are defined as

  typedef struct _virSomething virSomething;
  typedef virSomething *virSomethingPtr;
  struct _virSomething {
  ...
  };

Since you're tweaking both the definitions and the usage sites
anyway, might as well go the extra mile and adopt the most
common style as well.

Everything else looks good.

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list