From b8a02a7b7648ac7ce29d84ba3068a5f931fc47ef Mon Sep 17 00:00:00 2001 From: stefanf Date: Sun, 26 Sep 2004 13:47:25 +0000 Subject: Prefer C99's __func__ over GCC's __FUNCTION__. Approved by: dwmalone --- usr.sbin/inetd/inetd.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'usr.sbin/inetd') diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 0436f8d..fc29183 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -566,7 +566,7 @@ main(int argc, char **argv) #ifdef SANITY_CHECK if (nsock == 0) { - syslog(LOG_ERR, "%s: nsock=0", __FUNCTION__); + syslog(LOG_ERR, "%s: nsock=0", __func__); exit(EX_SOFTWARE); } #endif @@ -914,7 +914,7 @@ addchild(struct servtab *sep, pid_t pid) #ifdef SANITY_CHECK if (sep->se_numchild >= sep->se_maxchild) { syslog(LOG_ERR, "%s: %d >= %d", - __FUNCTION__, sep->se_numchild, sep->se_maxchild); + __func__, sep->se_numchild, sep->se_maxchild); exit(EX_SOFTWARE); } #endif @@ -1538,17 +1538,17 @@ enable(struct servtab *sep) #ifdef SANITY_CHECK if (sep->se_fd < 0) { syslog(LOG_ERR, - "%s: %s: bad fd", __FUNCTION__, sep->se_service); + "%s: %s: bad fd", __func__, sep->se_service); exit(EX_SOFTWARE); } if (ISMUX(sep)) { syslog(LOG_ERR, - "%s: %s: is mux", __FUNCTION__, sep->se_service); + "%s: %s: is mux", __func__, sep->se_service); exit(EX_SOFTWARE); } if (FD_ISSET(sep->se_fd, &allsock)) { syslog(LOG_ERR, - "%s: %s: not off", __FUNCTION__, sep->se_service); + "%s: %s: not off", __func__, sep->se_service); exit(EX_SOFTWARE); } nsock++; @@ -1567,21 +1567,21 @@ disable(struct servtab *sep) #ifdef SANITY_CHECK if (sep->se_fd < 0) { syslog(LOG_ERR, - "%s: %s: bad fd", __FUNCTION__, sep->se_service); + "%s: %s: bad fd", __func__, sep->se_service); exit(EX_SOFTWARE); } if (ISMUX(sep)) { syslog(LOG_ERR, - "%s: %s: is mux", __FUNCTION__, sep->se_service); + "%s: %s: is mux", __func__, sep->se_service); exit(EX_SOFTWARE); } if (!FD_ISSET(sep->se_fd, &allsock)) { syslog(LOG_ERR, - "%s: %s: not on", __FUNCTION__, sep->se_service); + "%s: %s: not on", __func__, sep->se_service); exit(EX_SOFTWARE); } if (nsock == 0) { - syslog(LOG_ERR, "%s: nsock=0", __FUNCTION__); + syslog(LOG_ERR, "%s: nsock=0", __func__); exit(EX_SOFTWARE); } nsock--; -- cgit v1.1