From 2e26fecf067130512f1ddc69b687021608793c8f Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Tue, 15 Feb 2005 18:20:50 +0000 Subject: [PATCH] Make the second argument to ncp_conn_asssert a const char *. Use __func__ while being here insteed of __FUNCTION__. --- sys/netproto/ncp/ncp_conn.c | 7 ++++--- sys/netproto/ncp/ncp_conn.h | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/netproto/ncp/ncp_conn.c b/sys/netproto/ncp/ncp_conn.c index f453b0f07c..78c7e38e3f 100644 --- a/sys/netproto/ncp/ncp_conn.c +++ b/sys/netproto/ncp/ncp_conn.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * $FreeBSD: src/sys/netncp/ncp_conn.c,v 1.3.2.5 2001/02/22 08:54:11 bp Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_conn.c,v 1.7 2004/03/01 06:33:18 dillon Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_conn.c,v 1.8 2005/02/15 18:20:50 joerg Exp $ * * Connection tables */ @@ -174,7 +174,8 @@ ncp_conn_unlock(struct ncp_conn *conn, struct thread *td) { } int -ncp_conn_assert_locked(struct ncp_conn *conn,char *checker, struct thread *td) +ncp_conn_assert_locked(struct ncp_conn *conn, const char *checker, + struct thread *td) { if (conn->nc_lock.lk_flags & LK_HAVE_EXCL) return 0; @@ -225,7 +226,7 @@ ncp_conn_free(struct ncp_conn *ncp) NCPFATAL("conn==NULL !\n"); return(EIO); } - error = ncp_conn_assert_locked(ncp, __FUNCTION__, ncp->td); + error = ncp_conn_assert_locked(ncp, __func__, ncp->td); if (error) return error; if (ncp->ref_cnt) { NCPFATAL("there are %d referenses left\n",ncp->ref_cnt); diff --git a/sys/netproto/ncp/ncp_conn.h b/sys/netproto/ncp/ncp_conn.h index 9495b9c65d..2036085730 100644 --- a/sys/netproto/ncp/ncp_conn.h +++ b/sys/netproto/ncp/ncp_conn.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netncp/ncp_conn.h,v 1.3 1999/12/29 04:46:15 peter Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_conn.h,v 1.4 2003/08/07 21:54:35 dillon Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_conn.h,v 1.5 2005/02/15 18:20:50 joerg Exp $ */ #ifndef _NETNCP_NCP_CONN_H_ #define _NETNCP_NCP_CONN_H_ @@ -210,7 +210,7 @@ int ncp_conn_free(struct ncp_conn *conn); int ncp_conn_access(struct ncp_conn *conn,struct ucred *cred,mode_t mode); int ncp_conn_lock(struct ncp_conn *conn,struct thread *td,struct ucred *cred,int mode); void ncp_conn_unlock(struct ncp_conn *conn,struct thread *td); -int ncp_conn_assert_locked(struct ncp_conn *conn,char *checker,struct thread *td); +int ncp_conn_assert_locked(struct ncp_conn *, const char *, struct thread *); /*int ncp_conn_ref(struct ncp_conn *conn, pid_t pid); int ncp_conn_rm_ref(struct ncp_conn *conn, pid_t pid, int force); void ncp_conn_list_rm_ref(pid_t pid);*/ -- 2.41.0