s3-build __FUNCTION__ is always available, always use it

This avoids duplication between FUNCTION_NAME and __FUNCTION__

diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index 4ed7ff285979140c1da267a1d22ef56c646b4daf..56e3b67aa6209167294269e40275c48a99895dc6 100644 (file)
--- 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 45193d2b5492cbd5a1ead13f8dfb4f858cbfa304..7e5b87a4185853d08a04460dccf5694d4a03cfa5 100644 (file)
--- 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 e26c1718d80e1a749e2e7c0cc0ee3a65426d5d2c..096dd2f3fde05cda64a5ab9855221d831d9bd6a3 100644 (file)
--- 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 */