summaryrefslogtreecommitdiffstats
path: root/lib/libc/gen/disklabel.c
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2002-02-01 01:32:19 +0000
committerobrien <obrien@FreeBSD.org>2002-02-01 01:32:19 +0000
commitb45ff0fb569a631733b0fe8174ef6bd2e76d6523 (patch)
tree00d3cf581cd6698c5f1022d99c44cb5d6fa3bd12 /lib/libc/gen/disklabel.c
parent821a3b87a652fabbbe0c63b418858e7bc7a1537b (diff)
downloadFreeBSD-src-b45ff0fb569a631733b0fe8174ef6bd2e76d6523.zip
FreeBSD-src-b45ff0fb569a631733b0fe8174ef6bd2e76d6523.tar.gz
* Remove __P and convert to ANSI prototypes.
* Remove 'register'. (some functions had 7+ register functions...) * Fix SCM ID's.
Diffstat (limited to 'lib/libc/gen/disklabel.c')
-rw-r--r--lib/libc/gen/disklabel.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index 19c0d19..ca48456 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -31,13 +31,11 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
+#if defined(LIBC_SCCS) && !defined(lint)$
static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 5/3/95";
-#endif
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
+#endif /* LIBC_SCCS and not lint */$
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
#include <sys/param.h>
#define DKTYPENAMES
@@ -52,15 +50,15 @@ static const char rcsid[] =
#include <unistd.h>
#include <ctype.h>
-static int gettype __P((char *, char **));
+static int gettype(char *, char **);
struct disklabel *
getdiskbyname(name)
const char *name;
{
static struct disklabel disk;
- register struct disklabel *dp = &disk;
- register struct partition *pp;
+ struct disklabel *dp = &disk;
+ struct partition *pp;
char *buf;
char *db_array[2] = { _PATH_DISKTAB, 0 };
char *cp, *cq; /* can't be register */
@@ -165,7 +163,7 @@ gettype(t, names)
char *t;
char **names;
{
- register char **nm;
+ char **nm;
for (nm = names; *nm; nm++)
if (strcasecmp(t, *nm) == 0)
OpenPOWER on IntegriCloud