Better debug subsystem usage

This commit is contained in:
Todd C. Miller
2012-02-02 11:28:33 -05:00
parent f5f9aadccc
commit 3da971ba33

View File

@@ -427,7 +427,7 @@ sudoers_io_open(unsigned int version, sudo_conv_t conversation,
FILE *io_logfile; FILE *io_logfile;
size_t len; size_t len;
int rval = -1; int rval = -1;
debug_decl(sudoers_io_open, SUDO_DEBUG_UTIL) debug_decl(sudoers_io_open, SUDO_DEBUG_PLUGIN)
if (!sudo_conv) if (!sudo_conv)
sudo_conv = conversation; sudo_conv = conversation;
@@ -578,7 +578,7 @@ static void
sudoers_io_close(int exit_status, int error) sudoers_io_close(int exit_status, int error)
{ {
int i; int i;
debug_decl(sudoers_io_close, SUDO_DEBUG_UTIL) debug_decl(sudoers_io_close, SUDO_DEBUG_PLUGIN)
if (sigsetjmp(error_jmp, 1)) { if (sigsetjmp(error_jmp, 1)) {
/* called via error(), errorx() or log_error() */ /* called via error(), errorx() or log_error() */
@@ -601,7 +601,7 @@ sudoers_io_close(int exit_status, int error)
static int static int
sudoers_io_version(int verbose) sudoers_io_version(int verbose)
{ {
debug_decl(sudoers_io_version, SUDO_DEBUG_UTIL) debug_decl(sudoers_io_version, SUDO_DEBUG_PLUGIN)
if (sigsetjmp(error_jmp, 1)) { if (sigsetjmp(error_jmp, 1)) {
/* called via error(), errorx() or log_error() */ /* called via error(), errorx() or log_error() */
@@ -621,7 +621,7 @@ static int
sudoers_io_log(const char *buf, unsigned int len, int idx) sudoers_io_log(const char *buf, unsigned int len, int idx)
{ {
struct timeval now, delay; struct timeval now, delay;
debug_decl(sudoers_io_version, SUDO_DEBUG_UTIL) debug_decl(sudoers_io_version, SUDO_DEBUG_PLUGIN)
gettimeofday(&now, NULL); gettimeofday(&now, NULL);