Module Name: src
Committed By: bad
Date: Tue Sep 8 08:59:09 UTC 2015
Modified Files:
src/sbin/raidctl: raidctl.c
Log Message:
Rename argument of rf_output_devname() from devname to name to avoid a
warning about shadowing a global symbol when compiled by buildrump.sh.
Discussed with mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sbin/raidctl/raidctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/raidctl/raidctl.c
diff -u src/sbin/raidctl/raidctl.c:1.62 src/sbin/raidctl/raidctl.c:1.63
--- src/sbin/raidctl/raidctl.c:1.62 Tue Jul 21 05:54:44 2015
+++ src/sbin/raidctl/raidctl.c Tue Sep 8 08:59:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: raidctl.c,v 1.62 2015/07/21 05:54:44 mrg Exp $ */
+/* $NetBSD: raidctl.c,v 1.63 2015/09/08 08:59:09 bad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: raidctl.c,v 1.62 2015/07/21 05:54:44 mrg Exp $");
+__RCSID("$NetBSD: raidctl.c,v 1.63 2015/09/08 08:59:09 bad Exp $");
#endif
@@ -577,12 +577,12 @@ rf_pm_configure(int fd, int raidID, char
}
/* convert "component0" into "absent" */
-static const char *rf_output_devname(const char *devname)
+static const char *rf_output_devname(const char *name)
{
- if (strncmp(devname, "component", 9) == 0)
+ if (strncmp(name, "component", 9) == 0)
return "absent";
- return devname;
+ return name;
}
static void
