isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build on compilers w/o __func__ or __FUNCTION__

Browse Source
This commit is contained in:
Todd C. Miller
2015-06-30 10:41:14 -06:00
parent 44f7ed3b11
commit 105f199f6b
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/sudo_debug.h
View File

@@ -98,12 +98,15 @@ struct sudo_conf_debug_file_list;
* and sets sudo_debug_subsys for sudo_debug_exit(). * and sets sudo_debug_subsys for sudo_debug_exit().
*/ */
#ifdef HAVE___FUNC__ #ifdef HAVE___FUNC__
# define debug_decl_func(funcname)
# define debug_decl_vars(funcname, subsys) \ # define debug_decl_vars(funcname, subsys) \
const int sudo_debug_subsys = (subsys); const int sudo_debug_subsys = (subsys);
#else #else
# define debug_decl_func(funcname) \
const char __func__[] = #funcname;
# define debug_decl_vars(funcname, subsys) \ # define debug_decl_vars(funcname, subsys) \
const int sudo_debug_subsys = (subsys); \ const int sudo_debug_subsys = (subsys); \
const char __func__[] = #funcname; debug_decl_func(funcname);
#endif #endif
#define debug_decl(funcname, subsys) \ #define debug_decl(funcname, subsys) \
debug_decl_vars((funcname), (subsys)) \ debug_decl_vars((funcname), (subsys)) \

4
lib/util/sudo_debug.c
View File

@@ -253,6 +253,7 @@ sudo_debug_register_v1(const char *program, const char *const subsystems[],
struct sudo_debug_output *output; struct sudo_debug_output *output;
struct sudo_debug_file *debug_file; struct sudo_debug_file *debug_file;
int idx, free_idx = -1; int idx, free_idx = -1;
debug_decl_func(sudo_debug_register);
if (debug_files == NULL) if (debug_files == NULL)
return SUDO_DEBUG_INSTANCE_INITIALIZER; return SUDO_DEBUG_INSTANCE_INITIALIZER;
@@ -357,6 +358,7 @@ sudo_debug_deregister_v1(int idx)
{ {
struct sudo_debug_instance *instance; struct sudo_debug_instance *instance;
struct sudo_debug_output *output, *next; struct sudo_debug_output *output, *next;
debug_decl_func(sudo_debug_deregister);
if (idx < 0 || idx > sudo_debug_last_instance) { if (idx < 0 || idx > sudo_debug_last_instance) {
sudo_warnx_nodebug("%s: invalid instance ID %d, max %d", sudo_warnx_nodebug("%s: invalid instance ID %d, max %d",
@@ -577,6 +579,7 @@ sudo_debug_vprintf2_v1(const char *func, const char *file, int lineno, int level
char static_buf[1024], *buf = static_buf; char static_buf[1024], *buf = static_buf;
struct sudo_debug_instance *instance; struct sudo_debug_instance *instance;
struct sudo_debug_output *output; struct sudo_debug_output *output;
debug_decl_func(sudo_debug_vprintf2);
if (sudo_debug_active_instance == -1) if (sudo_debug_active_instance == -1)
goto out; goto out;
@@ -667,6 +670,7 @@ sudo_debug_execve2_v1(int level, const char *path, char *const argv[], char *con
char * const *av; char * const *av;
char *cp, static_buf[4096], *buf = static_buf; char *cp, static_buf[4096], *buf = static_buf;
size_t plen; size_t plen;
debug_decl_func(sudo_debug_execve2);
if (sudo_debug_active_instance == -1) if (sudo_debug_active_instance == -1)
goto out; goto out;