CVS commit: src/sbin/cgdconfig

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sun Dec 14 23:25:07 UTC 2014

Modified Files:
        src/sbin/cgdconfig: cgdconfig.c

Log Message:
avoid local variable shadowing devname.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sbin/cgdconfig/cgdconfig.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/cgdconfig/cgdconfig.c
diff -u src/sbin/cgdconfig/cgdconfig.c:1.37 src/sbin/cgdconfig/cgdconfig.c:1.38
--- src/sbin/cgdconfig/cgdconfig.c:1.37	Sun Dec 14 07:31:39 2014
+++ src/sbin/cgdconfig/cgdconfig.c	Sun Dec 14 18:25:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdconfig.c,v 1.37 2014/12/14 12:31:39 mlelstv Exp $ */
+/* $NetBSD: cgdconfig.c,v 1.38 2014/12/14 23:25:07 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 2002, 2003\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: cgdconfig.c,v 1.37 2014/12/14 12:31:39 mlelstv Exp $");
+__RCSID("$NetBSD: cgdconfig.c,v 1.38 2014/12/14 23:25:07 christos Exp $");
 #endif
 
 #include <err.h>
@@ -512,13 +512,13 @@ configure(int argc, char **argv, struct 
 	int		 loop = 0;
 	int		 ret;
 	char		 cgdname[PATH_MAX];
-	char		 devname[PATH_MAX];
+	char		 devicename[PATH_MAX];
 	const char	*dev;
 
 	if (argc == 2 || argc == 3) {
-		dev = getfsspecname(devname, sizeof(devname), argv[1]);
+		dev = getfsspecname(devicename, sizeof(devicename), argv[1]);
 		if (dev == NULL) {
-			warnx("getfsspecname failed: %s", devname);
+			warnx("getfsspecname failed: %s", devicename);
 			return -1;
 		}
 	}
@@ -636,15 +636,15 @@ configure_stdin(struct params *p, int ar
 	int		 fd;
 	int		 ret;
 	char		 cgdname[PATH_MAX];
-	char		 devname[PATH_MAX];
+	char		 devicename[PATH_MAX];
 	const char	*dev;
 
 	if (argc < 3 || argc > 4)
 		usage();
 
-	dev = getfsspecname(devname, sizeof(devname), argv[1]);
+	dev = getfsspecname(devicename, sizeof(devicename), argv[1]);
 	if (dev == NULL) {
-		warnx("getfsspecname failed: %s", devname);
+		warnx("getfsspecname failed: %s", devicename);
 		return -1;
 	}