From 243abcb0af981d17dd7dd6c4d9908b855b15e90c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 1 Mar 2011 00:46:30 +1100 Subject: [PATCH] s3-build __FUNCTION__ is always available, always use it This avoids duplication between FUNCTION_NAME and __FUNCTION__ --- source3/include/safe_string.h | 2 +- source3/include/vfs.h | 4 ++-- 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 4ed7ff28597..56e3b67aa62 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 45193d2b549..7e5b87a4185 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 e26c1718d80..096dd2f3fde 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 */ -- 2.34.1