diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-03-01 00:46:30 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-03-01 02:13:22 +0100 |
| commit | 243abcb0af981d17dd7dd6c4d9908b855b15e90c (patch) | |
| tree | 606ea3705f94c855110f1f4998b7d4f1197493e1 /source3 | |
| parent | 608c8e787253f01b24f95c1523187a0a37737691 (diff) | |
| download | samba-243abcb0af981d17dd7dd6c4d9908b855b15e90c.tar.gz samba-243abcb0af981d17dd7dd6c4d9908b855b15e90c.tar.bz2 samba-243abcb0af981d17dd7dd6c4d9908b855b15e90c.zip | |
s3-build __FUNCTION__ is always available, always use it
This avoids duplication between FUNCTION_NAME and __FUNCTION__
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/safe_string.h | 2 | ||||
| -rw-r--r-- | source3/include/vfs.h | 4 | ||||
| -rw-r--r-- | source3/libsmb/clientgen.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h index 4ed7ff2859..56e3b67aa6 100644 --- a/source3/include/safe_string.h +++ b/source3/include/safe_string.h @@ -63,7 +63,7 @@ #endif /* !_SPLINT_ */ #ifdef DEVELOPER -#define SAFE_STRING_FUNCTION_NAME FUNCTION_MACRO +#define SAFE_STRING_FUNCTION_NAME __FUNCTION__ #define SAFE_STRING_LINE __LINE__ #else #define SAFE_STRING_FUNCTION_NAME ("") diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 45193d2b54..7e5b87a418 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -471,14 +471,14 @@ typedef struct vfs_statvfs_struct { #define SMB_VFS_HANDLE_GET_DATA(handle, datap, type, ret) { \ if (!(handle)||((datap=(type *)(handle)->data)==NULL)) { \ - DEBUG(0,("%s() failed to get vfs_handle->data!\n",FUNCTION_MACRO)); \ + DEBUG(0,("%s() failed to get vfs_handle->data!\n",__FUNCTION__)); \ ret; \ } \ } #define SMB_VFS_HANDLE_SET_DATA(handle, datap, free_fn, type, ret) { \ if (!(handle)) { \ - DEBUG(0,("%s() failed to set handle->data!\n",FUNCTION_MACRO)); \ + DEBUG(0,("%s() failed to set handle->data!\n",__FUNCTION__)); \ ret; \ } else { \ if ((handle)->free_data) { \ diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index e26c1718d8..096dd2f3fd 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -618,8 +618,8 @@ struct cli_state *cli_initialise_ex(int signing_state) #if defined(DEVELOPER) /* just because we over-allocate, doesn't mean it's right to use it */ - clobber_region(FUNCTION_MACRO, __LINE__, cli->outbuf+cli->bufsize, SAFETY_MARGIN); - clobber_region(FUNCTION_MACRO, __LINE__, cli->inbuf+cli->bufsize, SAFETY_MARGIN); + clobber_region(__FUNCTION__, __LINE__, cli->outbuf+cli->bufsize, SAFETY_MARGIN); + clobber_region(__FUNCTION__, __LINE__, cli->inbuf+cli->bufsize, SAFETY_MARGIN); #endif /* initialise signing */ |