X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/5d5c5d0d5b79ade9a973d55186ffda2638ba2b6e..8f6c56a50524aa785f7e596d52dddfb331e18961:/pexpert/gen/bootargs.c?ds=inline

diff --git a/pexpert/gen/bootargs.c b/pexpert/gen/bootargs.c
index 0489d7510..73b65b997 100644
--- a/pexpert/gen/bootargs.c
+++ b/pexpert/gen/bootargs.c
@@ -1,31 +1,29 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code 
- * as defined in and that are subject to the Apple Public Source License 
- * Version 2.0 (the 'License'). You may not use this file except in 
- * compliance with the License.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, unlawful or unlicensed copies of an Apple operating 
- * system, or to circumvent, violate, or enable the circumvention or 
- * violation of, any terms of an Apple operating system software license 
- * agreement.
- *
- * Please obtain a copy of the License at 
- * http://www.opensource.apple.com/apsl/ and read it before using this 
- * file.
- *
- * The Original Code and all software distributed under the License are 
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #include <pexpert/pexpert.h>
 
@@ -173,8 +171,8 @@ getval(
 	char *s, 
 	int *val)
 {
-	unsigned int radix, intval;
-        char c;
+	register unsigned radix, intval;
+	register unsigned char c;
 	int sign = 1;
 
 	if (*s == '=') {
@@ -183,7 +181,7 @@ getval(
 			sign = -1, s++;
 		intval = *s++-'0';
 		radix = 10;
-		if (intval == 0) {
+		if (intval == 0)
 			switch(*s) {
 
 			case 'x':
@@ -207,44 +205,28 @@ getval(
 				if (!isargsep(*s))
 					return (STR);
 			}
-                } else if (intval >= radix) {
-                    return (STR);
-                }
 		for(;;) {
-                        c = *s++;
-                        if (isargsep(c))
-                            break;
-                        if ((radix <= 10) &&
-                            ((c >= '0') && (c <= ('9' - (10 - radix))))) {
-                                c -= '0';
-                        } else if ((radix == 16) &&
-                                   ((c >= '0') && (c <= '9'))) {
+			if (((c = *s++) >= '0') && (c <= '9'))
 				c -= '0';
-                        } else if ((radix == 16) &&
-                                   ((c >= 'a') && (c <= 'f'))) {
+			else if ((c >= 'a') && (c <= 'f'))
 				c -= 'a' - 10;
-                        } else if ((radix == 16) &&
-                                   ((c >= 'A') && (c <= 'F'))) {
+			else if ((c >= 'A') && (c <= 'F'))
 				c -= 'A' - 10;
-                        } else if (c == 'k' || c == 'K') {
-				sign *= 1024;
+			else if (c == 'k' || c == 'K')
+				{ sign *= 1024; break; }
+			else if (c == 'm' || c == 'M')
+				{ sign *= 1024 * 1024; break; }
+			else if (c == 'g' || c == 'G')
+				{ sign *= 1024 * 1024 * 1024; break; }
+			else if (isargsep(c))
 				break;
-			} else if (c == 'm' || c == 'M') {
-				sign *= 1024 * 1024;
-                                break;
-			} else if (c == 'g' || c == 'G') {
-				sign *= 1024 * 1024 * 1024;
-                                break;
-			} else {
+			else
 				return (STR);
-                        }
 			if (c >= radix)
 				return (STR);
 			intval *= radix;
 			intval += c;
 		}
-                if (!isargsep(c) && !isargsep(*s))
-                    return STR;
 		*val = intval * sign;
 		return (NUM);
 	}