[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH] rename local variable to avoid clash with match macro



match will expand to guestfs___match, rename the local variable to avoid clash.

Signed-off-by: Olaf Hering <olaf aepfle de>

diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c
index 06ff96d..c30ad5a 100644
--- a/src/inspect-fs-unix.c
+++ b/src/inspect-fs-unix.c
@@ -1128,14 +1128,14 @@ map_md_devices(guestfs_h *g, Hash_table **map)
                                    mdadm_app_free);
   if (!*map) g->abort_cb();
 
-  for (char **match = matches; *match != NULL; match++) {
+  for (char **_match = matches; *_match != NULL; _match++) {
     /* Get device name and uuid for each array */
-    char *dev_path = safe_asprintf(g, "%s/devicename", *match);
+    char *dev_path = safe_asprintf(g, "%s/devicename", *_match);
     char *dev = guestfs_aug_get(g, dev_path);
     free(dev_path);
     if (!dev) goto error;
 
-    char *uuid_path = safe_asprintf(g, "%s/uuid", *match);
+    char *uuid_path = safe_asprintf(g, "%s/uuid", *_match);
     char *uuid = guestfs_aug_get(g, uuid_path);
     free(uuid_path);
     if (!uuid) {
-- 
1.7.12


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]