Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sbin/cgdconfig avoid local variable shadowing devname.



details:   https://anonhg.NetBSD.org/src/rev/e43d251622a4
branches:  trunk
changeset: 805051:e43d251622a4
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Dec 14 23:25:07 2014 +0000

description:
avoid local variable shadowing devname.

diffstat:

 sbin/cgdconfig/cgdconfig.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (54 lines):

diff -r 6af856079e57 -r e43d251622a4 sbin/cgdconfig/cgdconfig.c
--- a/sbin/cgdconfig/cgdconfig.c        Sun Dec 14 22:32:46 2014 +0000
+++ b/sbin/cgdconfig/cgdconfig.c        Sun Dec 14 23:25:07 2014 +0000
@@ -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 @@
        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 @@
        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;
        }
 



Home | Main Index | Thread Index | Old Index