Provide a convenient debugging macro.

Rename logmsg to wy_log.

20 files changed, 350 insertions, 399 deletions

diff --git a/src/builtin.c b/src/builtin.c
index 72b73cd..b812236 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -80,7 +80,7 @@ cmp_regex(const char *pat, const char *str, int flags)
                 char errbuf[512];
 
                 regerror(rc, &regex, errbuf, sizeof(errbuf));
-                logmsg(LOG_ERR, _("%s: cannot compile regexp: %s"), pat,
+                wy_log(LOG_ERR, _("%s: cannot compile regexp: %s"), pat,
                        errbuf);
                 return 0;
         }
@@ -119,7 +119,7 @@ parse_cmp_type(const char *pat, strcmp_fn * cmpfn, int *rf)
                                 break;
 
                         default:
-                                logmsg(LOG_NOTICE,
+                                wy_log(LOG_NOTICE,
                                        _("unrecognized comparison flag: %c"),
                                        *pat);
                         }
diff --git a/src/dictionary.c b/src/dictionary.c
index f46dd81..4f18267 100644
--- a/src/dictionary.c
+++ b/src/dictionary.c
@@ -65,10 +65,10 @@ dictionary_init(struct dictionary *dict)
                 return 0;
         if (wy_debug_level > 1) {
                 int i;
-                logmsg(LOG_DEBUG, _("initializing dictionary: %s \"%s\""),
+                wy_log(LOG_DEBUG, _("initializing dictionary: %s \"%s\""),
                        mp->name, SP(dict->query));
                 for (i = 0; i < dict->parmc; i++)
-                        logmsg(LOG_DEBUG, " parmv[%d]=%s", i, dict->parmv[i]);
+                        wy_log(LOG_DEBUG, " parmv[%d]=%s", i, dict->parmv[i]);
         }
         if (mp->init)
                 rc = mp->init(dict);
@@ -110,10 +110,10 @@ dictionary_done(struct dictionary *dict)
                 return 0;
         if (wy_debug_level > 1) {
                 int i;
-                logmsg(LOG_DEBUG, _("closing dictionary: %s \"%s\""),
+                wy_log(LOG_DEBUG, _("closing dictionary: %s \"%s\""),
                        mp->name, SP(dict->query));
                 for (i = 0; i < dict->parmc; i++)
-                        logmsg(LOG_DEBUG, " parmv[%d]=%s", i, dict->parmv[i]);
+                        wy_log(LOG_DEBUG, " parmv[%d]=%s", i, dict->parmv[i]);
         }
         if (mp->done)
                 rc = mp->done(dict);
@@ -128,24 +128,22 @@ dictionary_lookup(struct dictionary *dict, void *handle, const char *cmd)
 {
         struct dictionary_descr *mp = dictionary_tab + dict->type;
 
-        if (wy_debug_level > 1) {
-                if (cmd)
-                        logmsg(LOG_DEBUG, _("dictionary lookup: %s \"%s\""),
-                               mp->name, cmd);
-                else
-                        logmsg(LOG_DEBUG, _("dictionary lookup: %s"),
-                               mp->name);
-        }
+        if (cmd)
+                wy_debug(1, (_("dictionary lookup: %s \"%s\""),
+                             mp->name, cmd));
+        else
+                wy_debug(1, (_("dictionary lookup: %s"),
+                             mp->name));
 
         if (!dict->init_passed) {
-                logmsg(LOG_CRIT,
+                wy_log(LOG_CRIT,
                        _("INTERNAL ERROR: "
                          "dictionary %s \"%s\" not initialized"),
                        mp->name, SP(dict->query));
                 return 1;
         }
         if (!mp->lookup) {
-                logmsg(LOG_CRIT,
+                wy_log(LOG_CRIT,
                        _("INTERNAL ERROR: "
                          "no lookup function for dictionary %s \"%s\""),
                        mp->name, SP(dict->query));
diff --git a/src/directive.c b/src/directive.c
index cc43c16..481e267 100644
--- a/src/directive.c
+++ b/src/directive.c
@@ -25,9 +25,8 @@ directive_parse(struct file_triplet *trp)
         size_t dcount, i, j;
         char *p;
 
-        if (wy_debug_level > 2)
-                logmsg(LOG_DEBUG, _("%s: parsing directive blurb: %s"),
-                       trp->file[file_directive].name, trp->blurb);
+        wy_debug(3, (_("%s: parsing directive blurb: %s"),
+                     trp->file[file_directive].name, trp->blurb));
 
         dcount = 0;
         for (p = trp->blurb; *p; p++)
@@ -44,7 +43,7 @@ directive_parse(struct file_triplet *trp)
                 if (trim(trp->directive[j]) == 0) /* ignore empty lines */
                         continue;
                 if (strchr(trp->directive[j], ':') == NULL) {
-                        logmsg(LOG_ERR, _("%s: invalid line: %s"),
+                        wy_log(LOG_ERR, _("%s: invalid line: %s"),
                                trp->file[file_directive].name,
                                trp->directive[j]);
                         free(trp->directive);
@@ -174,17 +173,17 @@ directive_version_in_range_p(struct file_triplet *trp,
         unsigned version;
 
         if (directive_get_value(trp, "version", &val)) {
-                logmsg(LOG_ERR, _("%s: missing `version' directive"),
+                wy_log(LOG_ERR, _("%s: missing `version' directive"),
                        trp->file[file_directive].name);
                 return 0;
         }
 
         if (directive_pack_version(val, &version)) {
-                logmsg(LOG_ERR, _("%s: unparsable version: %s"),
+                wy_log(LOG_ERR, _("%s: unparsable version: %s"),
                        trp->file[file_directive].name, val);
                 return 0;
         }
-        logmsg(LOG_NOTICE, _("%s: VERSION: %s"),
+        wy_log(LOG_NOTICE, _("%s: VERSION: %s"),
                trp->file[file_directive].name, val);
 
         trp->version = version;
@@ -192,7 +191,7 @@ directive_version_in_range_p(struct file_triplet *trp,
         if (from <= version && version <= to)
                 return 1;
 
-        logmsg(LOG_ERR, _("%s: version %s is not in the allowed range"),
+        wy_log(LOG_ERR, _("%s: version %s is not in the allowed range"),
                trp->file[file_directive].name, val);
         return 0;
 }
@@ -257,7 +256,7 @@ verify_directive_format(struct file_triplet *trp)
                 switch (dnum) {
                 case 1:
                         if (strcmp(key, "version")) {
-                                logmsg(LOG_ERR,
+                                wy_log(LOG_ERR,
                                        _("%s:%d: expected `%s' but found `%s'"),
                                        trp->file[file_directive].name, n,
                                        "version", key);
@@ -267,7 +266,7 @@ verify_directive_format(struct file_triplet *trp)
 
                 case 2:
                         if (strcmp(key, "directory")) {
-                                logmsg(LOG_ERR,
+                                wy_log(LOG_ERR,
                                        _("%s:%d: expected `%s' but found `%s'"),
                                        trp->file[file_directive].name, n,
                                        "directory", key);
@@ -277,7 +276,7 @@ verify_directive_format(struct file_triplet *trp)
 
                 default:
                         if (find_directive(key) == unknown_dir) {
-                                logmsg(LOG_ERR,
+                                wy_log(LOG_ERR,
                                        _("%s:%d: unknown directive `%s'"),
                                        trp->file[file_directive].name, n, key);
                                 return 1;
@@ -288,12 +287,12 @@ verify_directive_format(struct file_triplet *trp)
         if (trp->file[file_dist].name && trp->file[file_signature].name) {