Libc-1244.1.7.tar.gz

[apple/libc.git] / gen / disklabel.c

diff --git a/gen/disklabel.c b/gen/disklabel.c
index b88f91d0c91b14bbcf8aa89d22fc00ce2dcc7a7e..fe90e212f5bec381be0408a1a145c0b8c86c1362 100644 (file)
--- a/gen/disklabel.c
+++ b/gen/disklabel.c
@@ -73,7 +73,7 @@
 #ifdef unused
 static int     error(int);
 #endif // unused
-static int     gettype(char *, char **);
+static int     gettype(const char *, const char **);
 
 struct disklabel *
 getdiskbyname(const char *name)
@@ -121,7 +121,7 @@ getdiskbyname(const char *name)
                dp->d_flags |= D_BADSECT;
 
 #define getnumdflt(field, dname, dflt) \
-        { long f; (field) = (cgetnum(buf, dname, &f) == -1) ? (dflt) : f; }
+        { long f; (field) = (typeof(field))((cgetnum(buf, dname, &f) == -1) ? (dflt) : f); }
 
        getnumdflt(dp->d_secsize, "se", DEV_BSIZE);
        cgetnum(buf, "nt",(long *) &dp->d_ntracks);
@@ -184,15 +184,13 @@ getdiskbyname(const char *name)
 }
 
 static int
-gettype(t, names)
-       char *t;
-       char **names;
+gettype(const char *t, const char **names)
 {
-       register char **nm;
+       const char **nm;
 
        for (nm = names; *nm; nm++)
                if (strcasecmp(t, *nm) == 0)
-                       return (nm - names);
+                       return (int)(nm - names);
        if (isdigit(*t))
                return (atoi(t));
        return (0);