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

devd: use C++ style casts

Browse Source
This commit is contained in:
Eitan Adler 2018-07-29 08:43:08 +00:00
parent 514e2dbfa6
commit fc67c746c0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sbin/devd/devd.cc
View File

@ -262,12 +262,12 @@ my_system(const char *command)
*/ */
cfg.close_pidfile(); cfg.close_pidfile();
::closefrom(3); ::closefrom(3);
::execl(_PATH_BSHELL, "sh", "-c", command, (char *)NULL); ::execl(_PATH_BSHELL, "sh", "-c", command, nullptr);
::_exit(127); ::_exit(127);
default: /* parent */ default: /* parent */
savedpid = pid; savedpid = pid;
do { do {
pid = ::wait4(savedpid, &pstat, 0, (struct rusage *)0); pid = ::wait4(savedpid, &pstat, 0, nullptr);
} while (pid == -1 && errno == EINTR); } while (pid == -1 && errno == EINTR);
break; break;
} }
@ -374,7 +374,7 @@ media::do_match(config &c)
memset(&ifmr, 0, sizeof(ifmr)); memset(&ifmr, 0, sizeof(ifmr));
strlcpy(ifmr.ifm_name, value.c_str(), sizeof(ifmr.ifm_name)); strlcpy(ifmr.ifm_name, value.c_str(), sizeof(ifmr.ifm_name));
if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) >= 0 && if (ioctl(s, SIOCGIFMEDIA, &ifmr) >= 0 &&
ifmr.ifm_status & IFM_AVALID) { ifmr.ifm_status & IFM_AVALID) {
devdlog(LOG_DEBUG, "%s has media type 0x%x\n", devdlog(LOG_DEBUG, "%s has media type 0x%x\n",
value.c_str(), IFM_TYPE(ifmr.ifm_active)); value.c_str(), IFM_TYPE(ifmr.ifm_active));
@ -527,7 +527,7 @@ config::open_pidfile()
pfh = pidfile_open(_pidfile.c_str(), 0600, &otherpid); pfh = pidfile_open(_pidfile.c_str(), 0600, &otherpid);
if (pfh == NULL) { if (pfh == NULL) {
if (errno == EEXIST) if (errno == EEXIST)
errx(1, "devd already running, pid: %d", (int)otherpid); errx(1, "devd already running, pid: %d", static_cast<int>(otherpid));
warn("cannot open pid file"); warn("cannot open pid file");
} }
} }
@ -854,7 +854,7 @@ process_event(char *buffer)
// Save the time this happened (as approximated by when we got // Save the time this happened (as approximated by when we got
// around to processing it). // around to processing it).
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
asprintf(&timestr, "%jd.%06ld", (uintmax_t)tv.tv_sec, tv.tv_usec); asprintf(&timestr, "%jd.%06ld", static_cast<uintmax_t>(tv.tv_sec), tv.tv_usec);
cfg.set_variable("timestamp", timestr); cfg.set_variable("timestamp", timestr);
free(timestr); free(timestr);
@ -919,7 +919,7 @@ create_socket(const char *name, int socktype)
unlink(name); unlink(name);
if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0) if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0)
err(1, "fcntl"); err(1, "fcntl");
if (::bind(fd, (struct sockaddr *) & sun, slen) < 0) if (::bind(fd, reinterpret_cast<struct sockaddr *>(&sun), slen) < 0)
err(1, "bind"); err(1, "bind");
listen(fd, 4); listen(fd, 4);
if (chown(name, 0, 0)) /* XXX - root.wheel */ if (chown(name, 0, 0)) /* XXX - root.wheel */