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/netsmb | |
| 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/netsmb')
| -rw-r--r-- | sys/netsmb/smb_smb.c | 6 | ||||
| -rw-r--r-- | sys/netsmb/smb_subr.h | 8 | ||||
| -rw-r--r-- | sys/netsmb/smb_trantcp.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/netsmb/smb_smb.c b/sys/netsmb/smb_smb.c index 242b941..16e99ed 100644 --- a/sys/netsmb/smb_smb.c +++ b/sys/netsmb/smb_smb.c @@ -92,7 +92,7 @@ smb_smb_negotiate(struct smb_vc *vcp, struct smb_cred *scred) u_int16_t dindex, tw, tw1, swlen, bc; int error, maxqsz; - if (smb_smb_nomux(vcp, scred, __FUNCTION__) != 0) + if (smb_smb_nomux(vcp, scred, __func__) != 0) return EINVAL; vcp->vc_hflags = 0; vcp->vc_hflags2 = 0; @@ -238,7 +238,7 @@ smb_smb_ssnsetup(struct smb_vc *vcp, struct smb_cred *scred) vcp->vc_smbuid = SMB_UID_UNKNOWN; - if (smb_smb_nomux(vcp, scred, __FUNCTION__) != 0) + if (smb_smb_nomux(vcp, scred, __func__) != 0) return EINVAL; error = smb_rq_alloc(VCTOCP(vcp), SMB_COM_SESSION_SETUP_ANDX, scred, &rqp); @@ -336,7 +336,7 @@ smb_smb_ssnclose(struct smb_vc *vcp, struct smb_cred *scred) if (vcp->vc_smbuid == SMB_UID_UNKNOWN) return 0; - if (smb_smb_nomux(vcp, scred, __FUNCTION__) != 0) + if (smb_smb_nomux(vcp, scred, __func__) != 0) return EINVAL; error = smb_rq_alloc(VCTOCP(vcp), SMB_COM_LOGOFF_ANDX, scred, &rqp); diff --git a/sys/netsmb/smb_subr.h b/sys/netsmb/smb_subr.h index 8591893..1d2a304 100644 --- a/sys/netsmb/smb_subr.h +++ b/sys/netsmb/smb_subr.h @@ -44,17 +44,17 @@ MALLOC_DECLARE(M_SMBTEMP); #define FB_CURRENT -#define SMBERROR(format, args...) printf("%s: "format, __FUNCTION__ ,## args) -#define SMBPANIC(format, args...) printf("%s: "format, __FUNCTION__ ,## args) +#define SMBERROR(format, args...) printf("%s: "format, __func__ ,## args) +#define SMBPANIC(format, args...) printf("%s: "format, __func__ ,## args) #ifdef SMB_SOCKET_DEBUG -#define SMBSDEBUG(format, args...) printf("%s: "format, __FUNCTION__ ,## args) +#define SMBSDEBUG(format, args...) printf("%s: "format, __func__ ,## args) #else #define SMBSDEBUG(format, args...) #endif #ifdef SMB_IOD_DEBUG -#define SMBIODEBUG(format, args...) printf("%s: "format, __FUNCTION__ ,## args) +#define SMBIODEBUG(format, args...) printf("%s: "format, __func__ ,## args) #else #define SMBIODEBUG(format, args...) #endif diff --git a/sys/netsmb/smb_trantcp.h b/sys/netsmb/smb_trantcp.h index 6c625fa..d160fa4 100644 --- a/sys/netsmb/smb_trantcp.h +++ b/sys/netsmb/smb_trantcp.h @@ -38,7 +38,7 @@ #ifdef NB_DEBUG #define NBDEBUG(format, args...) printf("%s(%d): "format, \ - __FUNCTION__ , __LINE__ ,## args) + __func__ , __LINE__ ,## args) #else #define NBDEBUG(format, args...) #endif |
