diff options
author | ed <ed@FreeBSD.org> | 2012-02-10 12:40:50 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2012-02-10 12:40:50 +0000 |
commit | 2b4f7a9e8aff3b740995b6d2aff23de6cad7646d (patch) | |
tree | e58bb6f43a8fb4f066acbf8988270a1d095d2357 /sys/kern/kern_conf.c | |
parent | 28b4a002d6c95bc9e26ea30871aa91c1cc4b3563 (diff) | |
download | FreeBSD-src-2b4f7a9e8aff3b740995b6d2aff23de6cad7646d.zip FreeBSD-src-2b4f7a9e8aff3b740995b6d2aff23de6cad7646d.tar.gz |
Merge si_name and __si_namebuf.
The si_name pointer always points to the __si_namebuf member inside the
same object. Remove it and rename __si_namebuf to si_name.
Diffstat (limited to 'sys/kern/kern_conf.c')
-rw-r--r-- | sys/kern/kern_conf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index 85737e8..0ca4fcc 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -690,16 +690,16 @@ prep_devname(struct cdev *dev, const char *fmt, va_list ap) mtx_assert(&devmtx, MA_OWNED); - len = vsnrprintf(dev->__si_namebuf, sizeof(dev->__si_namebuf), 32, + len = vsnrprintf(dev->si_name, sizeof(dev->si_name), 32, fmt, ap); - if (len > sizeof(dev->__si_namebuf) - 1) + if (len > sizeof(dev->si_name) - 1) return (ENAMETOOLONG); /* Strip leading slashes. */ - for (from = dev->__si_namebuf; *from == '/'; from++) + for (from = dev->si_name; *from == '/'; from++) ; - for (to = dev->__si_namebuf; *from != '\0'; from++, to++) { + for (to = dev->si_name; *from != '\0'; from++, to++) { /* Treat multiple sequential slashes as single. */ while (from[0] == '/' && from[1] == '/') from++; @@ -710,11 +710,11 @@ prep_devname(struct cdev *dev, const char *fmt, va_list ap) } *to = '\0'; - if (dev->__si_namebuf[0] == '\0') + if (dev->si_name[0] == '\0') return (EINVAL); /* Disallow "." and ".." components. */ - for (s = dev->__si_namebuf;;) { + for (s = dev->si_name;;) { for (q = s; *q != '/' && *q != '\0'; q++) ; if (q - s == 1 && s[0] == '.') @@ -726,7 +726,7 @@ prep_devname(struct cdev *dev, const char *fmt, va_list ap) s = q + 1; } - if (devfs_dev_exists(dev->__si_namebuf) != 0) + if (devfs_dev_exists(dev->si_name) != 0) return (EEXIST); return (0); |