diff options
author | obrien <obrien@FreeBSD.org> | 2001-12-10 08:09:49 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2001-12-10 08:09:49 +0000 |
commit | 7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6 (patch) | |
tree | b580d740769b3b201f76ad941e8b0b8ca3015bc0 /sys/netncp | |
parent | 957a76ab241ec60b1b21124054416935dba9688b (diff) | |
download | FreeBSD-src-7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6.zip FreeBSD-src-7fd9a6a23abf2fb25b5925b444d0eed93c8d06f6.tar.gz |
Update to C99, s/__FUNCTION__/__func__/,
also don't use ANSI string concatenation.
Diffstat (limited to 'sys/netncp')
-rw-r--r-- | sys/netncp/ncp_conn.c | 4 | ||||
-rw-r--r-- | sys/netncp/ncp_ncp.c | 2 | ||||
-rw-r--r-- | sys/netncp/ncp_rq.c | 4 | ||||
-rw-r--r-- | sys/netncp/ncp_subr.h | 10 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sys/netncp/ncp_conn.c b/sys/netncp/ncp_conn.c index fbe9b15..85f4163 100644 --- a/sys/netncp/ncp_conn.c +++ b/sys/netncp/ncp_conn.c @@ -275,7 +275,7 @@ ncp_conn_free(struct ncp_conn *ncp) return EACCES; } p = ncp->procp; - error = ncp_conn_assert_locked(ncp, __FUNCTION__, p); + error = ncp_conn_assert_locked(ncp, __func__, p); if (error) return error; if (ncp->ref_cnt != 0 || (ncp->flags & NCPFL_PERMANENT)) @@ -357,7 +357,7 @@ ncp_conn_login(struct ncp_conn *conn, struct proc *p, struct ucred *cred) error = ncp_get_encryption_key(conn, ncp_key); if (error) { - printf("%s: Warning: use unencrypted login\n", __FUNCTION__); + printf("%s: Warning: use unencrypted login\n", __func__); error = ncp_login_unencrypted(conn, conn->li.objtype, conn->li.user, conn->li.password, p, cred); } else { diff --git a/sys/netncp/ncp_ncp.c b/sys/netncp/ncp_ncp.c index b7799cc..8d86c02 100644 --- a/sys/netncp/ncp_ncp.c +++ b/sys/netncp/ncp_ncp.c @@ -444,7 +444,7 @@ ncp_write(struct ncp_conn *conn, ncp_fh *file, struct uio *uiop, struct ucred *c int error = 0, len, tsiz, backup; if (uiop->uio_iovcnt != 1) { - printf("%s: can't handle iovcnt>1 !!!\n", __FUNCTION__); + printf("%s: can't handle iovcnt>1 !!!\n", __func__); return EIO; } tsiz = uiop->uio_resid; diff --git a/sys/netncp/ncp_rq.c b/sys/netncp/ncp_rq.c index 4bc1d86..a415adc 100644 --- a/sys/netncp/ncp_rq.c +++ b/sys/netncp/ncp_rq.c @@ -253,7 +253,7 @@ ncp_request_int(struct ncp_rq *rqp) int error, len, dosend, plen = 0, gotpacket; if (so == NULL) { - printf("%s: ncp_so is NULL !\n",__FUNCTION__); + printf("%s: ncp_so is NULL !\n",__func__); ncp_conn_invalidate(conn); return ENOTCONN; } @@ -334,7 +334,7 @@ ncp_request_int(struct ncp_rq *rqp) if (m->m_len < sizeof(*rp)) { m = m_pullup(m, sizeof(*rp)); if (m == NULL) { - printf("%s: reply too short\n",__FUNCTION__); + printf("%s: reply too short\n",__func__); continue; } } diff --git a/sys/netncp/ncp_subr.h b/sys/netncp/ncp_subr.h index b1db7af..a4c4559 100644 --- a/sys/netncp/ncp_subr.h +++ b/sys/netncp/ncp_subr.h @@ -41,7 +41,7 @@ SIGISMEMBER(set, SIGQUIT)) -#define NCP_PRINT(format, args...) printf("FATAL: %s: "format, __FUNCTION__ ,## args) +#define NCP_PRINT(format, args...) printf("FATAL: %s: "format, __func__ ,## args) #define nwfs_printf NCP_PRINT /* Maybe this should panic, but I dont like that */ #define NCPFATAL NCP_PRINT @@ -49,14 +49,14 @@ /* socket debugging */ #ifdef NCP_SOCKET_DEBUG -#define NCPSDEBUG(format, args...) printf("%s: "format, __FUNCTION__ ,## args) +#define NCPSDEBUG(format, args...) printf("%s: "format, __func__ ,## args) #else #define NCPSDEBUG(format, args...) #endif /* NCP calls debug */ #ifdef NCP_NCP_DEBUG -#define NCPNDEBUG(format, args...) printf("%s: "format, __FUNCTION__ ,## args) +#define NCPNDEBUG(format, args...) printf("%s: "format, __func__ ,## args) #else #define NCPNDEBUG(format, args...) #endif @@ -70,14 +70,14 @@ /* FS VOPS debug */ #ifdef NWFS_VOPS_DEBUG -#define NCPVODEBUG(format, args...) printf("%s: "format, __FUNCTION__ ,## args) +#define NCPVODEBUG(format, args...) printf("%s: "format, __func__ ,## args) #else #define NCPVODEBUG(format, args...) #endif /* FS VNOPS debug */ #ifdef NWFS_VNOPS_DEBUG -#define NCPVNDEBUG(format, args...) printf("%s: "format, __FUNCTION__ ,## args) +#define NCPVNDEBUG(format, args...) printf("%s: "format, __func__ ,## args) #else #define NCPVNDEBUG(format, args...) #endif |