d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Perform some cleanups to devname(3).

Browse Source 
- Make sure the mode argument is either a character or a block device.
- Use S_IS*() instead of checking S_IF*-flags by hand.
- Don't use kern.devname when the argument is already NODEV.
- Always call snprintf with the proper amount of arguments corresponding
  with the format.
- Perform some whitespace fixes. Tabs instead of 4 spaces, missing space
  for return statement.
- Remove unneeded includes.
This commit is contained in:
ed 2010-01-31 14:51:04 +00:00
parent 5c7ad05f88
commit e48113132a
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/libc/gen/devname.c
View File

@ -36,10 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/sysctl.h>
#include <err.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/param.h>
#include <sys/stat.h>
@ -49,22 +46,22 @@ devname_r(dev_t dev, mode_t type, char *buf, int len)
{
int i;
size_t j;
char *r;
if ((type & S_IFMT) == S_IFCHR) {
if (dev == NODEV || !(S_ISCHR(type) || S_ISBLK(dev))) {
strlcpy(buf, "#NODEV", len);
return (buf);
}
if (S_ISCHR(type)) {
j = len;
i = sysctlbyname("kern.devname", buf, &j, &dev, sizeof (dev));
if (i == 0)
return (buf);
return (buf);
}
/* Finally just format it */
if (dev == NODEV)
r = "#NODEV";
else
r = "#%c:%d:0x%x";
snprintf(buf, len, r,
(type & S_IFMT) == S_IFCHR ? 'C' : 'B', major(dev), minor(dev));
snprintf(buf, len, "#%c:%d:0x%x",
S_ISCHR(type) ? 'C' : 'B', major(dev), minor(dev));
return (buf);
}
@ -73,5 +70,5 @@ devname(dev_t dev, mode_t type)
{
static char buf[SPECNAMELEN + 1];
return(devname_r(dev, type, buf, sizeof(buf)));
return (devname_r(dev, type, buf, sizeof(buf)));
}