diff options
| author | Stefan Farfeleder <stefanf@FreeBSD.org> | 2004-09-26 13:47:25 +0000 |
|---|---|---|
| committer | Stefan Farfeleder <stefanf@FreeBSD.org> | 2004-09-26 13:47:25 +0000 |
| commit | 80c4c0db4fc10b2007afce66399f629e8e766c18 (patch) | |
| tree | 005649f3ae845e88d56b3f933ae21d49ae100297 /usr.sbin/inetd/inetd.c | |
| parent | 13c133ac067387adb2e541f27fc57a77a19df7b4 (diff) | |
| download | src-80c4c0db4fc10b2007afce66399f629e8e766c18.tar.gz src-80c4c0db4fc10b2007afce66399f629e8e766c18.zip | |
Prefer C99's __func__ over GCC's __FUNCTION__.
Approved by: dwmalone
Notes
Notes:
svn path=/head/; revision=135823
Diffstat (limited to 'usr.sbin/inetd/inetd.c')
| -rw-r--r-- | usr.sbin/inetd/inetd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 0436f8d675b3..fc29183d44ab 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--; |