35c35
< * $Id: openpam_debug.h 491 2011-11-12 00:12:32Z des $
---
> * $Id: openpam_debug.h 606 2012-04-20 11:06:38Z des $
38,39c38,39
< #ifndef OPENPAM_DEBUG_INCLUDED
< #define OPENPAM_DEBUG_INCLUDED
---
> #ifndef OPENPAM_DEBUG_H_INCLUDED
> #define OPENPAM_DEBUG_H_INCLUDED
42c42
< #define ENTER() openpam_log(PAM_LOG_DEBUG, "entering")
---
> #define ENTER() openpam_log(PAM_LOG_LIBDEBUG, "entering")
46c46
< openpam_log(PAM_LOG_DEBUG, "entering: %s", pam_item_name[i_]); \
---
> openpam_log(PAM_LOG_LIBDEBUG, "entering: %s", pam_item_name[i_]); \
48c48
< openpam_log(PAM_LOG_DEBUG, "entering: %d", i_); \
---
> openpam_log(PAM_LOG_LIBDEBUG, "entering: %d", i_); \
52c52
< openpam_log(PAM_LOG_DEBUG, "entering: %d", n_); \
---
> openpam_log(PAM_LOG_LIBDEBUG, "entering: %d", n_); \
57c57
< openpam_log(PAM_LOG_DEBUG, "entering: NULL"); \
---
> openpam_log(PAM_LOG_LIBDEBUG, "entering: NULL"); \
59c59
< openpam_log(PAM_LOG_DEBUG, "entering: '%s'", s_); \
---
> openpam_log(PAM_LOG_LIBDEBUG, "entering: '%s'", s_); \
61c61,69
< #define RETURNV() openpam_log(PAM_LOG_DEBUG, "returning")
---
> #define ENTERF(f) do { \
> int f_ = (f); \
> if (f_ >= 0 && f_ <= OPENPAM_NUM_FEATURES) \
> openpam_log(PAM_LOG_LIBDEBUG, "entering: %s", \
> openpam_features[f_].name); \
> else \
> openpam_log(PAM_LOG_LIBDEBUG, "entering: %d", f_); \
> } while (0)
> #define RETURNV() openpam_log(PAM_LOG_LIBDEBUG, "returning")
65c73
< openpam_log(PAM_LOG_DEBUG, "returning %s", pam_err_name[c_]); \
---
> openpam_log(PAM_LOG_LIBDEBUG, "returning %s", pam_err_name[c_]); \
67c75
< openpam_log(PAM_LOG_DEBUG, "returning %d!", c_); \
---
> openpam_log(PAM_LOG_LIBDEBUG, "returning %d!", c_); \
72c80
< openpam_log(PAM_LOG_DEBUG, "returning %d", n_); \
---
> openpam_log(PAM_LOG_LIBDEBUG, "returning %d", n_); \
76c84
< const void *p_ = (p); \
---
> void *p_ = (p); \
78c86
< openpam_log(PAM_LOG_DEBUG, "returning NULL"); \
---
> openpam_log(PAM_LOG_LIBDEBUG, "returning NULL"); \
80c88
< openpam_log(PAM_LOG_DEBUG, "returning %p", p_); \
---
> openpam_log(PAM_LOG_LIBDEBUG, "returning %p", p_); \
86c94
< openpam_log(PAM_LOG_DEBUG, "returning NULL"); \
---
> openpam_log(PAM_LOG_LIBDEBUG, "returning NULL"); \
88c96
< openpam_log(PAM_LOG_DEBUG, "returning '%s'", s_); \
---
> openpam_log(PAM_LOG_LIBDEBUG, "returning '%s'", s_); \
95a104
> #define ENTERF(f)