summaryrefslogtreecommitdiffstats
path: root/src
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 15:03:42 +0100
commit47634e60f75c5f2a1a4050ef82e58675a6cd0a71 (patch)
tree10dc5d02a548a63410a2b050fe7b15d1a12321d5 /src
parent1d95c97bff733a3c7bcd7f1171486ae9c9c3be99 (diff)
downloadlibguestfs-47634e60f75c5f2a1a4050ef82e58675a6cd0a71.tar.gz
libguestfs-47634e60f75c5f2a1a4050ef82e58675a6cd0a71.tar.xz
libguestfs-47634e60f75c5f2a1a4050ef82e58675a6cd0a71.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) (cherry picked from commit 409a80476442a65b3c4498422fa6c812e21ba928)
Diffstat (limited to 'src')
-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 1933efb9..d5e40a98 100644
--- a/src/inspect_fs_unix.c
+++ b/src/inspect_fs_unix.c
@@ -1103,14 +1103,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) {