From owner-svn-src-head@freebsd.org Sun Jul 29 08:43:10 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0931A1050640; Sun, 29 Jul 2018 08:43:10 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 75D4F77485; Sun, 29 Jul 2018 08:43:09 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 10FC7137E2; Sun, 29 Jul 2018 08:43:09 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6T8h89F010713; Sun, 29 Jul 2018 08:43:08 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6T8h8jY010712; Sun, 29 Jul 2018 08:43:08 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201807290843.w6T8h8jY010712@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 29 Jul 2018 08:43:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336867 - head/sbin/devd X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/sbin/devd X-SVN-Commit-Revision: 336867 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jul 2018 08:43:10 -0000 Author: eadler Date: Sun Jul 29 08:43:08 2018 New Revision: 336867 URL: https://svnweb.freebsd.org/changeset/base/336867 Log: devd: use C++ style casts Modified: head/sbin/devd/devd.cc Modified: head/sbin/devd/devd.cc ============================================================================== --- head/sbin/devd/devd.cc Sun Jul 29 08:43:05 2018 (r336866) +++ head/sbin/devd/devd.cc Sun Jul 29 08:43:08 2018 (r336867) @@ -262,12 +262,12 @@ my_system(const char *command) */ cfg.close_pidfile(); ::closefrom(3); - ::execl(_PATH_BSHELL, "sh", "-c", command, (char *)NULL); + ::execl(_PATH_BSHELL, "sh", "-c", command, nullptr); ::_exit(127); default: /* parent */ savedpid = pid; do { - pid = ::wait4(savedpid, &pstat, 0, (struct rusage *)0); + pid = ::wait4(savedpid, &pstat, 0, nullptr); } while (pid == -1 && errno == EINTR); break; } @@ -374,7 +374,7 @@ media::do_match(config &c) memset(&ifmr, 0, sizeof(ifmr)); 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) { devdlog(LOG_DEBUG, "%s has media type 0x%x\n", value.c_str(), IFM_TYPE(ifmr.ifm_active)); @@ -527,7 +527,7 @@ config::open_pidfile() pfh = pidfile_open(_pidfile.c_str(), 0600, &otherpid); if (pfh == NULL) { if (errno == EEXIST) - errx(1, "devd already running, pid: %d", (int)otherpid); + errx(1, "devd already running, pid: %d", static_cast(otherpid)); warn("cannot open pid file"); } } @@ -854,7 +854,7 @@ process_event(char *buffer) // Save the time this happened (as approximated by when we got // around to processing it). gettimeofday(&tv, NULL); - asprintf(×tr, "%jd.%06ld", (uintmax_t)tv.tv_sec, tv.tv_usec); + asprintf(×tr, "%jd.%06ld", static_cast(tv.tv_sec), tv.tv_usec); cfg.set_variable("timestamp", timestr); free(timestr); @@ -919,7 +919,7 @@ create_socket(const char *name, int socktype) unlink(name); if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0) err(1, "fcntl"); - if (::bind(fd, (struct sockaddr *) & sun, slen) < 0) + if (::bind(fd, reinterpret_cast(&sun), slen) < 0) err(1, "bind"); listen(fd, 4); if (chown(name, 0, 0)) /* XXX - root.wheel */