vfs_conf.c: Fix a warning and remove 'nowerror'.
authorSascha Wildner <saw@online.de>
Sun, 3 Jan 2010 14:43:05 +0000 (15:43 +0100)
committerSascha Wildner <saw@online.de>
Sun, 3 Jan 2010 14:43:05 +0000 (15:43 +0100)
sys/conf/files
sys/kern/vfs_conf.c

index 56c6a72..1ff75a2 100644 (file)
@@ -762,7 +762,7 @@ kern/uipc_usrreq.c  standard
 kern/vfs_bio.c         standard
 kern/vfs_cache.c       standard
 kern/vfs_cluster.c     standard
-kern/vfs_conf.c                standard nowerror
+kern/vfs_conf.c                standard
 kern/vfs_default.c     standard
 kern/vfs_helper.c      standard
 kern/vfs_init.c                standard
index 5c9076d..5628474 100644 (file)
@@ -360,7 +360,8 @@ vfs_mountroot_try(const char *mountfrom)
        int             error;
        char            patt[32];
        int             mountfromlen, len;
-       char            *cp, *ep, *mf;
+       const char      *cp, *ep;
+       char            *mf;
 
        vfsname = NULL;
        devname = NULL;
@@ -376,7 +377,7 @@ vfs_mountroot_try(const char *mountfrom)
        crit_exit();
 
        mountfromlen = strlen(mountfrom);
-       cp = (char*)mountfrom;
+       cp = mountfrom;
        /* parse vfs name and devname */
        vfsname = kmalloc(MFSNAMELEN, M_MOUNT, M_WAITOK);
        devname = kmalloc(MNAMELEN, M_MOUNT, M_WAITOK);