diff --git a/src/common/bitstring.c b/src/common/bitstring.c
index 4834f707a155cd6031487069b4ff317ead995dab..f1f9b14ad61b1d2f1a30fe1855392263231430b4 100644
--- a/src/common/bitstring.c
+++ b/src/common/bitstring.c
@@ -165,7 +165,7 @@ bit_alloc(bitoff_t nbits)
_assert_valid_size(nbits);
new = (bitstr_t *)xmalloc(_bitstr_words(nbits) * sizeof(bitstr_t));
if (!new) {
- log_oom(__FILE__, __LINE__, __CURRENT_FUNC__);
+ log_oom(__FILE__, __LINE__, __func__);
abort();
}
@@ -189,7 +189,7 @@ bit_realloc(bitstr_t *b, bitoff_t nbits)
_assert_valid_size(nbits);
new = xrealloc(b, _bitstr_words(nbits) * sizeof(bitstr_t));
if (!new) {
- log_oom(__FILE__, __LINE__, __CURRENT_FUNC__);
+ log_oom(__FILE__, __LINE__, __func__);
abort();
}
diff --git a/src/common/macros.h b/src/common/macros.h
index 67e8e5e3240f8e439722f41a00e9c02009c5d1ea..8ea312a7bea241abe45b7d1505903192979952eb 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -43,20 +43,10 @@
# include "config.h"
#endif
-#ifndef NULL
-# include <stddef.h> /* for NULL */
-#endif
-
-#if HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# ifndef bool
- typedef enum {false, true} bool;
-# endif
-#endif /* !HAVE_STDBOOL_H */
-
#include <errno.h> /* for errno */
#include <pthread.h>
+#include <stdbool.h> /* for bool type */
+#include <stddef.h> /* for NULL */
#include <stdlib.h> /* for abort() */
#include "src/common/log.h" /* for error() */
@@ -118,21 +108,6 @@
# define NTOH_uint64(x) UINT64_SWAP_LE_BE (x)
#endif /* SLURM_BIGENDIAN */
-
-
-/*
-** define __CURRENT_FUNC__ macro for returning current function
-*/
-#if defined (__GNUC__) && (__GNUC__ < 3)
-# define __CURRENT_FUNC__ __PRETTY_FUNCTION__
-#else /* !__GNUC__ */
-# ifdef _AIX
-# define __CURRENT_FUNC__ __func__
-# else
-# define __CURRENT_FUNC__ ""
-# endif /* _AIX */
-#endif /* __GNUC__ */
-
#ifndef __STRING
# define __STRING(arg) #arg
#endif
@@ -157,7 +132,7 @@
if (err) { \
errno = err; \
fatal("%s:%d %s: pthread_mutex_init(): %m", \
- __FILE__, __LINE__, __CURRENT_FUNC__); \
+ __FILE__, __LINE__, __func__); \
abort(); \
} \
} while (0)
@@ -168,7 +143,7 @@
if (err) { \
errno = err; \
fatal("%s:%d %s: pthread_mutex_destroy(): %m", \
- __FILE__, __LINE__, __CURRENT_FUNC__); \
+ __FILE__, __LINE__, __func__); \
abort(); \
} \
} while (0)
@@ -179,7 +154,7 @@
if (err) { \
errno = err; \
fatal("%s:%d %s: pthread_mutex_lock(): %m", \
- __FILE__, __LINE__, __CURRENT_FUNC__); \
+ __FILE__, __LINE__, __func__); \
abort(); \
} \
} while (0)
@@ -190,7 +165,7 @@
if (err) { \
errno = err; \
fatal("%s:%d %s: pthread_mutex_unlock(): %m", \
- __FILE__, __LINE__, __CURRENT_FUNC__); \
+ __FILE__, __LINE__, __func__); \
abort(); \
} \
} while (0)
diff --git a/src/common/pack.c b/src/common/pack.c
index ec7b6e1eb6cfb352f7e50793fe8080582a4552dc..591c6a8d436425447c46827d6d8d2e992f3588b4 100644
--- a/src/common/pack.c
+++ b/src/common/pack.c
@@ -761,7 +761,7 @@ int unpackmem_malloc(char **valp, uint32_t * size_valp, Buf buffer)
return SLURM_ERROR;
*valp = malloc(*size_valp);
if (*valp == NULL) {
- log_oom(__FILE__, __LINE__, __CURRENT_FUNC__);
+ log_oom(__FILE__, __LINE__, __func__);
abort();
}
memcpy(*valp, &buffer->head[buffer->processed],
diff --git a/src/common/slurm_protocol_defs.h b/src/common/slurm_protocol_defs.h
index caeae1ade1947524e20d3ccad1ee32c586c1887d..47dbc92aa15551db9237b184d8d88d05422ed119 100644
--- a/src/common/slurm_protocol_defs.h
+++ b/src/common/slurm_protocol_defs.h
@@ -1457,16 +1457,16 @@ extern char *rpc_num2string(uint16_t opcode);
rc = read(fd, ptr, remaining); \
if ((rc == 0) && (remaining == size)) { \
debug("%s:%d: %s: safe_read EOF", \
- __FILE__, __LINE__, __CURRENT_FUNC__); \
+ __FILE__, __LINE__, __func__); \
goto rwfail; \
} else if (rc == 0) { \
debug("%s:%d: %s: safe_read (%d of %d) EOF", \
- __FILE__, __LINE__, __CURRENT_FUNC__, \
+ __FILE__, __LINE__, __func__, \
remaining, (int)size); \
goto rwfail; \
} else if (rc < 0) { \
debug("%s:%d: %s: safe_read (%d of %d) failed: %m", \
- __FILE__, __LINE__, __CURRENT_FUNC__, \
+ __FILE__, __LINE__, __func__, \
remaining, (int)size); \
goto rwfail; \
} else { \
@@ -1474,7 +1474,7 @@ extern char *rpc_num2string(uint16_t opcode);
remaining -= rc; \
if (remaining > 0) \
debug3("%s:%d: %s: safe_read (%d of %d) partial read", \
- __FILE__, __LINE__, __CURRENT_FUNC__, \
+ __FILE__, __LINE__, __func__, \
remaining, (int)size); \
} \
} \
@@ -1488,7 +1488,7 @@ extern char *rpc_num2string(uint16_t opcode);
rc = write(fd, ptr, remaining); \
if (rc < 0) { \
debug("%s:%d: %s: safe_write (%d of %d) failed: %m", \
- __FILE__, __LINE__, __CURRENT_FUNC__, \
+ __FILE__, __LINE__, __func__, \
remaining, (int)size); \
goto rwfail; \
} else { \
@@ -1496,7 +1496,7 @@ extern char *rpc_num2string(uint16_t opcode);
remaining -= rc; \
if (remaining > 0) \
debug3("%s:%d: %s: safe_write (%d of %d) partial write", \
- __FILE__, __LINE__, __CURRENT_FUNC__, \
+ __FILE__, __LINE__, __func__, \
remaining, (int)size); \
} \
} \
diff --git a/src/common/unsetenv.c b/src/common/unsetenv.c
index fe05efbddfde0749e6529de7287984bfbbabdede..44986cfee0c1ad70602f3ab39c77e4cccd832e7a 100644
--- a/src/common/unsetenv.c
+++ b/src/common/unsetenv.c
@@ -53,7 +53,7 @@ extern int unsetenv (const char *name)
len = strlen(name);
tmp = malloc(len + 3);
if (!tmp) {
- log_oom(__FILE__, __LINE__, __CURRENT_FUNC__);
+ log_oom(__FILE__, __LINE__, __func__);
abort();
}
strcpy(tmp, name);
diff --git a/src/common/xassert.h b/src/common/xassert.h
index a53ce29d3d79c482bebfd43e9d7e51571d357523..55e3b2c768cd24094ac68a60a3099218f4e9076f 100644
--- a/src/common/xassert.h
+++ b/src/common/xassert.h
@@ -55,7 +55,7 @@
# define xassert(__ex) do { \
(__ex) ? ((void)0) : \
- __xassert_failed(__STRING(__ex), __FILE__, __LINE__, __CURRENT_FUNC__);\
+ __xassert_failed(__STRING(__ex), __FILE__, __LINE__, __func__);\
} while (0)
/* This prints the assertion failed message to the slurm log facility
diff --git a/src/common/xmalloc.c b/src/common/xmalloc.c
index 025eac62f91266f39c1974caeb2aa9b9a00f1cba..6367ec1305e47ab577ce3bd31c3d451e82829c2e 100644
--- a/src/common/xmalloc.c
+++ b/src/common/xmalloc.c
@@ -61,7 +61,7 @@ static void malloc_assert_failed(char *, const char *, int,
# define xmalloc_assert(expr) do { \
(expr) ? ((void)(0)) : \
malloc_assert_failed(__STRING(expr), file, line, func, \
- __CURRENT_FUNC__); \
+ __func__); \
} while (0)
#endif /* NDEBUG */
diff --git a/src/common/xmalloc.h b/src/common/xmalloc.h
index 1d5f6b983c77dc0174d39fe66adad4aebf9c5aec..e1197ee19e44e6f432f7a7a8086f7b27ec40d4ba 100644
--- a/src/common/xmalloc.h
+++ b/src/common/xmalloc.h
@@ -83,31 +83,31 @@
#include "macros.h"
#define xmalloc(__sz) \
- slurm_xmalloc (__sz, true, __FILE__, __LINE__, __CURRENT_FUNC__)
+ slurm_xmalloc (__sz, true, __FILE__, __LINE__, __func__)
#define xmalloc_nz(__sz) \
- slurm_xmalloc (__sz, false, __FILE__, __LINE__, __CURRENT_FUNC__)
+ slurm_xmalloc (__sz, false, __FILE__, __LINE__, __func__)
#define try_xmalloc(__sz) \
- slurm_try_xmalloc(__sz, __FILE__, __LINE__, __CURRENT_FUNC__)
+ slurm_try_xmalloc(__sz, __FILE__, __LINE__, __func__)
#define xfree(__p) \
- slurm_xfree((void **)&(__p), __FILE__, __LINE__, __CURRENT_FUNC__)
+ slurm_xfree((void **)&(__p), __FILE__, __LINE__, __func__)
#define xrealloc(__p, __sz) \
slurm_xrealloc((void **)&(__p), __sz, true, \
- __FILE__, __LINE__, __CURRENT_FUNC__)
+ __FILE__, __LINE__, __func__)
#define xrealloc_nz(__p, __sz) \
slurm_xrealloc((void **)&(__p), __sz, false, \
- __FILE__, __LINE__, __CURRENT_FUNC__)
+ __FILE__, __LINE__, __func__)
#define try_xrealloc(__p, __sz) \
slurm_try_xrealloc((void **)&(__p), __sz, \
- __FILE__, __LINE__, __CURRENT_FUNC__)
+ __FILE__, __LINE__, __func__)
#define xsize(__p) \
- slurm_xsize((void *)__p, __FILE__, __LINE__, __CURRENT_FUNC__)
+ slurm_xsize((void *)__p, __FILE__, __LINE__, __func__)
void *slurm_xmalloc(size_t, bool, const char *, int, const char *);
void *slurm_try_xmalloc(size_t , const char *, int , const char *);
diff --git a/src/plugins/select/bluegene/bl/bridge_linker.c b/src/plugins/select/bluegene/bl/bridge_linker.c
index 46ccc4d1b40b5dd6021f66c8c0d3a1f6ed70a38d..bd3f602e08b0ae83692ebbac3caea3041351da89 100644
--- a/src/plugins/select/bluegene/bl/bridge_linker.c
+++ b/src/plugins/select/bluegene/bl/bridge_linker.c
@@ -2236,7 +2236,7 @@ extern status_t bridge_get_block_info(char *bg_block_id,
else if (rc) {
errno = rc;
error("%s:%d %s: pthread_mutex_trylock(): %m",
- __FILE__, __LINE__, __CURRENT_FUNC__);
+ __FILE__, __LINE__, __func__);
}
//slurm_mutex_lock(&api_file_mutex);