diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-03-10 23:25:11 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-03-10 23:26:52 +0200 |
commit | 39a97e438dde837ada9a99cceea93a1cf97db19e (patch) | |
tree | efc492dcfcdc2c21bfdec5c31692b348601cd94a /src/wydawca.c | |
parent | 87602f5492b842f734dffe22f4e2f85dbc6ce713 (diff) | |
download | wydawca-39a97e438dde837ada9a99cceea93a1cf97db19e.tar.gz wydawca-39a97e438dde837ada9a99cceea93a1cf97db19e.tar.bz2 |
Provide a convenient debugging macro.
Rename logmsg to wy_log.
Diffstat (limited to 'src/wydawca.c')
-rw-r--r-- | src/wydawca.c | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/src/wydawca.c b/src/wydawca.c index 6c342c9..66c6390 100644 --- a/src/wydawca.c +++ b/src/wydawca.c @@ -104,7 +104,7 @@ static void (*log_printer) (int prio, const char *fmt, va_list ap) = stderr_printer; void -logmsg(int prio, char *fmt, ...) +wy_log(int prio, char *fmt, ...) { va_list ap; @@ -124,6 +124,17 @@ logmsg(int prio, char *fmt, ...) log_printer(prio, fmt, ap); va_end(ap); } + +void +wy_dbg(char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + log_printer(LOG_DEBUG, fmt, ap); + va_end(ap); +} + static char *stat_name[MAX_STAT] = { N_("errors"), @@ -208,7 +219,7 @@ logstats() if (stat_mask_p(print_stats)) { for (i = 0; i < MAX_STAT; i++) if (print_stats & STAT_MASK(i)) - logmsg(LOG_INFO, "%s: %u", + wy_log(LOG_INFO, "%s: %u", gettext(stat_name[i]), wydawca_stat[i]); } @@ -246,18 +257,18 @@ grecs_print_diag(grecs_locus_t *locus, int err, int errcode, const char *msg) if (locstr) { if (errcode) - logmsg(err ? LOG_ERR : LOG_WARNING, "%s: %s: %s", + wy_log(err ? LOG_ERR : LOG_WARNING, "%s: %s: %s", locstr, msg, strerror(errcode)); else - logmsg(err ? LOG_ERR : LOG_WARNING, "%s: %s", + wy_log(err ? LOG_ERR : LOG_WARNING, "%s: %s", locstr, msg); free(locstr); } else { if (errcode) - logmsg(err ? LOG_ERR : LOG_WARNING, "%s: %s", msg, + wy_log(err ? LOG_ERR : LOG_WARNING, "%s: %s", msg, strerror(errcode)); else - logmsg(err ? LOG_ERR : LOG_WARNING, "%s", msg); + wy_log(err ? LOG_ERR : LOG_WARNING, "%s", msg); } } @@ -277,7 +288,7 @@ collect_uids(int argc, char **argv) char *p; unsigned n = strtoul(argv[i], &p, 10); if (*p) { - logmsg(LOG_ERR, _("no such user: %s"), + wy_log(LOG_ERR, _("no such user: %s"), argv[i]); exit(EX_NOUSER); } @@ -295,10 +306,10 @@ wydawca_daemon() { if (!foreground) { if (daemon(0, 0)) { - logmsg(LOG_ERR, "%s", strerror(errno)); + wy_log(LOG_ERR, "%s", strerror(errno)); exit(EX_OSERR); } - logmsg(LOG_NOTICE, _("daemon launched")); + wy_log(LOG_NOTICE, _("daemon launched")); } check_pidfile(); @@ -339,10 +350,10 @@ main(int argc, char **argv) p = gpgme_check_version("1.1.0"); if (!p) { - logmsg(LOG_CRIT, _("GPGMe version check failed")); + wy_log(LOG_CRIT, _("GPGMe version check failed")); exit(EX_UNAVAILABLE); - } else if (wy_debug_level > 3) - logmsg(LOG_DEBUG, _("using GPGME version %s"), p); + } else + wy_debug(4, (_("using GPGME version %s"), p)); if (argc) collect_uids(argc, argv); @@ -383,7 +394,7 @@ main(int argc, char **argv) if (getgid() == 0) { if (wydawca_uid == 0) { if (!force_startup) { - logmsg(LOG_CRIT, + wy_log(LOG_CRIT, _("won't run with root privileges")); exit(EX_UNAVAILABLE); } @@ -395,7 +406,7 @@ main(int argc, char **argv) wydawca_lock_init(); - logmsg(LOG_NOTICE, _("wydawca (%s) started"), PACKAGE_STRING); + wy_log(LOG_NOTICE, _("wydawca (%s) started"), PACKAGE_STRING); if (!daemon_mode) { scan_all_spools(uidc, uidv); @@ -405,7 +416,7 @@ main(int argc, char **argv) modules_close(); - logmsg(LOG_NOTICE, _("wydawca (%s) finished"), PACKAGE_STRING); + wy_log(LOG_NOTICE, _("wydawca (%s) finished"), PACKAGE_STRING); if (reconfigure) { int i; |