[libvirt] [PATCH 1/4] conf: use typedefs for enums in "src/conf/{node_device_conf, nwfilter_params}.h"

[Eric Blake]

On 05/12/2014 03:32 PM, Eric Blake wrote:
> On 05/11/2014 09:08 AM, Julio Faracco wrote:
> 

Another helpful action: when resending an updated patch, use 'git
send-email --subject-prefix=PATCHv2' to make it obvious in the subject
line that it is a resend, then after the '---' separator, add comments
explaining why it is better than v1.

> 
>> In "src/conf/" there are many enumeration (enum) declarations. Similar to the recent cleanup to "src/util" directory, it's better to use a typedef for variable types, function types and other usages. Other enumeration and folders will be changed to typedef's in the future. Most of the files changed in this commit are reltaed to Network (node_device_conf.h and nwfilter_params.*) enums.
>>

> So, in spite of all that, your patch itself is fine, so I'm going to
> amend the commit message to avoid long lines (hey - that means I
> actually added my S-o-b via my normal policy after all) and push it shortly.

Take that back. Your patch STILL fails to compile:

  CC
nwfilter/libvirt_driver_nwfilter_impl_la-nwfilter_ebiptables_driver.lo
node_device/node_device_udev.c:1179:24: error: 'enum virNodeDevCapType'
declared inside parameter list [-Werror]
                   enum virNodeDevCapType *type)
                        ^
node_device/node_device_udev.c:1179:24: error: its scope is only this
definition or declaration, which is probably not what you want [-Werror]

Here's what I had to squash before pushing this patch.

diff --git i/src/node_device/node_device_hal.c
w/src/node_device/node_device_hal.c
index 5dbc3eb..8656b5d 100644
--- i/src/node_device/node_device_hal.c
+++ w/src/node_device/node_device_hal.c
@@ -1,7 +1,7 @@
 /*
  * node_device_hal.c: node device enumeration - HAL-based implementation
  *
- * Copyright (C) 2011, 2013 Red Hat, Inc.
+ * Copyright (C) 2011-2014 Red Hat, Inc.
  * Copyright (C) 2008 Virtual Iron Software, Inc.
  * Copyright (C) 2008 David F. Lively
  *
@@ -343,7 +343,7 @@ gather_system_cap(LibHalContext *ctx, const char *udi,

 struct _caps_tbl_entry {
     const char *cap_name;
-    enum virNodeDevCapType type;
+    virNodeDevCapType type;
     int (*gather_fn)(LibHalContext *ctx,
                      const char *udi,
                      union _virNodeDevCapData *data);
diff --git i/src/node_device/node_device_udev.c
w/src/node_device/node_device_udev.c
index d24f2dc..9a951d9 100644
--- i/src/node_device/node_device_udev.c
+++ w/src/node_device/node_device_udev.c
@@ -1176,7 +1176,7 @@ udevHasDeviceProperty(struct udev_device *dev,

 static int
 udevGetDeviceType(struct udev_device *device,
-                  enum virNodeDevCapType *type)
+                  virNodeDevCapType *type)
 {
     const char *devtype = NULL;
     char *subsystem = NULL;


-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 604 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140512/0cd8aac0/attachment-0001.sig>