sbr/mf.c: Simplify logic, ditching endless for-loops and switch.

[nmh] / sbr / context_replace.c

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index b97162ba09b846ed72e610ed8c803470352dc922..1027dcf6f9d925e1b4990098649620b13e23e3f8 100644 (file)
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -33,7 +33,7 @@ context_replace (char *key, char *value)
      * this key, and replace its value if found.
      */
     for (np = m_defs;; np = np->n_next) {
      * this key, and replace its value if found.
      */
     for (np = m_defs;; np = np->n_next) {

-       if (!strcasecmp (np->n_name ? np->n_name : "", key ? key : "")) {
+       if (!strcasecmp (FENDNULL(np->n_name), FENDNULL(key))) {

            if (strcmp (value, np->n_field)) {
                if (!np->n_context)
                    inform("bug: context_replace(key=\"%s\",value=\"%s\"), continuing...", key, value);
            if (strcmp (value, np->n_field)) {
                if (!np->n_context)
                    inform("bug: context_replace(key=\"%s\",value=\"%s\"), continuing...", key, value);