--- Libc/Libc-1725.40.4/gen/disklabel.c
+++ Libc/Libc-262/gen/disklabel.c
@@ -1,22 +1,21 @@
 /*
- * Copyright (c) 1999, 2008 Apple Inc. All rights reserved.
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource 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
+ * This 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.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -58,9 +57,8 @@
 #include <sys/time.h>
 #define DKTYPENAMES
 #include <sys/disklabel.h>
-/* from ufs/ffs/fs.h */
-#define BBSIZE		8192
-#define SBSIZE		8192
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>
 
 #include <errno.h>
 #include <fcntl.h>
@@ -70,19 +68,16 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcomma"
-
-#ifdef unused
-static int	error(int);
-#endif // unused
-static int	gettype(const char *, const char **);
+static int	error __P((int));
+static int	gettype __P((char *, char **));
 
 struct disklabel *
-getdiskbyname(const char *name)
+getdiskbyname(name)
+	const char *name;
 {
-	static struct disklabel *dp = NULL;
-	struct partition *pp;
+	static struct	disklabel disk;
+	register struct	disklabel *dp = &disk;
+	register struct partition *pp;
 	char	*buf;
 	char  	*db_array[2] = { _PATH_DISKTAB, 0 };
 	char	*cp, *cq;	/* can't be register */
@@ -93,14 +88,7 @@
 	if (cgetent(&buf, db_array, (char *) name) < 0)
 		return NULL;
 
-	if (dp == NULL) {
-		dp = malloc(sizeof(struct disklabel));
-		if (dp == NULL) {
-			return NULL;
-		}
-	}
-	memset(dp, 0, sizeof(struct disklabel));
-
+	bzero((char *)&disk, sizeof(disk));
 	/*
 	 * typename
 	 */
@@ -124,7 +112,7 @@
 		dp->d_flags |= D_BADSECT;
 
 #define getnumdflt(field, dname, dflt) \
-        { long f; (field) = (typeof(field))((cgetnum(buf, dname, &f) == -1) ? (dflt) : f); }
+        { long f; (field) = (cgetnum(buf, dname, &f) == -1) ? (dflt) : f; }
 
 	getnumdflt(dp->d_secsize, "se", DEV_BSIZE);
 	cgetnum(buf, "nt",(long *) &dp->d_ntracks);
@@ -187,19 +175,20 @@
 }
 
 static int
-gettype(const char *t, const char **names)
+gettype(t, names)
+	char *t;
+	char **names;
 {
-	const char **nm;
+	register char **nm;
 
 	for (nm = names; *nm; nm++)
 		if (strcasecmp(t, *nm) == 0)
-			return (int)(nm - names);
+			return (nm - names);
 	if (isdigit(*t))
 		return (atoi(t));
 	return (0);
 }
 
-#ifdef unused
 static int
 error(err)
 	int err;
@@ -213,6 +202,3 @@
 	(void)write(STDERR_FILENO, p, strlen(p));
 	(void)write(STDERR_FILENO, "\n", 1);
 }
-#endif // unused
-#pragma clang diagnostic pop
-