search for: major_num

...usr/kinit/name_to_dev.c b/usr/kinit/name_to_dev.c index 593bc12..e5ad1cc 100644 --- a/usr/kinit/name_to_dev.c +++ b/usr/kinit/name_to_dev.c @@ -20,7 +20,7 @@ static dev_t try_name(char *name, int part) char path[BUF_SZ]; char buf[BUF_SZ]; int range; - unsigned int major, minor; + unsigned int major_num, minor_num; dev_t res; char *s; int len; @@ -37,13 +37,13 @@ static dev_t try_name(char *name, int part) if (len <= 0 || len == BUF_SZ || buf[len - 1] != '\n') goto fail; buf[len - 1] = '\0'; - major = strtoul(buf, &s, 10); + major_num = strtoul(buf, &s, 10);...

...trncmp(name, "/dev/", 5)) { - if ((cptr = strchr(devname+5, ':')) && - cptr[1] != '\0') { + cptr = strchr(devname+5, ':'); + if (cptr && cptr[1] != '\0') { /* Colon-separated decimal device number */ *cptr = '\0'; major_num = strtoul(devname+5, &e1, 10); diff --git a/usr/kinit/nfsroot.c b/usr/kinit/nfsroot.c index b5ab3bb..3b80773 100644 --- a/usr/kinit/nfsroot.c +++ b/usr/kinit/nfsroot.c @@ -56,9 +56,8 @@ int mount_nfs_root(int argc, char *argv[], int flags) dev_bootpath = dev->bootpath; break; } -...

The following patchset implements 3 seperate series of changes. External Building ================= Patches 1 through 8 enable to use of klibc's build system while leaving the src tree pristine (and potentially read only). Specifically: - srctree=<Sources for klibc> - objtree=<Ouput directory for klibc> - KLIBCKERNELSRC=<Kernel sources> - KLIBCKERNELOBJ=<Kernel