summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2012-09-20 15:19:43 +0200
committerRichard W.M. Jones <rjones@redhat.com>2012-10-01 14:45:19 +0100
commit409a80476442a65b3c4498422fa6c812e21ba928 (patch)
treed0366d45704d72fb2c893e714fd39af7ca0a2f05
parent9a01948a80cf4d6c3902b23c12d88e1b886dc4a5 (diff)
downloadlibguestfs-409a80476442a65b3c4498422fa6c812e21ba928.tar.gz
libguestfs-409a80476442a65b3c4498422fa6c812e21ba928.tar.xz
libguestfs-409a80476442a65b3c4498422fa6c812e21ba928.zip
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> (cherry picked from commit b36b44af9e177fe5c9677d430abc7cba0633049c)
-rw-r--r--src/inspect-fs-unix.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c
index d9bf5bf6..960d5af0 100644
--- a/src/inspect-fs-unix.c
+++ b/src/inspect-fs-unix.c
@@ -1123,14 +1123,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 **m = matches; *m != NULL; m++) {
/* 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", *m);
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", *m);
char *uuid = guestfs_aug_get(g, uuid_path);
free(uuid_path);
if (!uuid) {