Merge commit '8206fbf', due to my screwup of committing it on a detached

[nmh] / sbr / smatch.c

diff --git a/sbr/smatch.c b/sbr/smatch.c
index 88a098b3a0e629678b3c386eb1f51e728aacf33f..4d1d3d6814b7f977897a2dbd22819de3ee220788 100644 (file)
--- a/sbr/smatch.c
+++ b/sbr/smatch.c
@@ -29,16 +29,16 @@ smatch(char *string, struct swit *swp)
            continue;                   /* no match */
        for (sp = string; *sp == *tcp++;) {
            if (*sp++ == '\0')
-               return (tp - swp);      /* exact match */
+               return tp->swret;       /* exact match */
        }
        if (*sp) {
            if (*sp != ' ')
                continue;               /* no match */
            if (*--tcp == '\0')
-               return (tp - swp);      /* exact match */
+               return tp->swret;       /* exact match */
        }
        if (firstone == UNKWNSW)
-           firstone = tp - swp;
+           firstone = tp->swret;
        else
            firstone = AMBIGSW;
     }