--- Libc/Libc-1725.40.4/gen/disklabel.c
+++ Libc/Libc-391/gen/disklabel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008 Apple Inc. All rights reserved.
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -58,9 +58,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 +69,18 @@
 #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	gettype(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 +91,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 +115,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,13 +178,15 @@
 }
 
 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);
@@ -214,5 +207,3 @@
 	(void)write(STDERR_FILENO, "\n", 1);
 }
 #endif // unused
-#pragma clang diagnostic pop
-