Module Name: src
Committed By: matt
Date: Fri Sep 5 05:24:53 UTC 2014
Modified Files:
src/sys/arch/arm/arm: bootconfig.c
Log Message:
Don't use not as a variable since it's reserved in C++.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/arm/bootconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/bootconfig.c
diff -u src/sys/arch/arm/arm/bootconfig.c:1.6 src/sys/arch/arm/arm/bootconfig.c:1.7
--- src/sys/arch/arm/arm/bootconfig.c:1.6 Sun Aug 2 11:32:05 2009
+++ src/sys/arch/arm/arm/bootconfig.c Fri Sep 5 05:24:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bootconfig.c,v 1.6 2009/08/02 11:32:05 gavan Exp $ */
+/* $NetBSD: bootconfig.c,v 1.7 2014/09/05 05:24:53 matt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -38,7 +38,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: bootconfig.c,v 1.6 2009/08/02 11:32:05 gavan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bootconfig.c,v 1.7 2014/09/05 05:24:53 matt Exp $");
#include <sys/systm.h>
@@ -56,7 +56,7 @@ get_bootconf_option(char *opts, const ch
{
char *ptr;
char *optstart;
- int not;
+ bool neg;
ptr = opts;
@@ -68,12 +68,12 @@ get_bootconf_option(char *opts, const ch
if (*ptr == 0)
break;
- not = 0;
+ neg = false;
/* Is it a negate option */
if ((type & BOOTOPT_TYPE_MASK) == BOOTOPT_TYPE_BOOLEAN &&
*ptr == '!') {
- not = 1;
+ neg = true;
++ptr;
}
@@ -99,7 +99,7 @@ get_bootconf_option(char *opts, const ch
((u_int)strtoul(ptr, NULL,
10) != 0);
else
- *((int *)result) = !not;
+ *((int *)result) = !neg;
break;
case BOOTOPT_TYPE_STRING :
*((char **)result) = ptr;
