X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6c42153ad9362cc676ea66563bf400d7511b3b68..c3238c0e:/sbr/smatch.c?ds=sidebyside

diff --git a/sbr/smatch.c b/sbr/smatch.c
index 1a104ada..f30e5899 100644
--- a/sbr/smatch.c
+++ b/sbr/smatch.c
@@ -1,8 +1,4 @@
-
-/*
- * smatch.c -- match a switch (option)
- *
- * $Id$
+/* smatch.c -- match a switch (option)
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -13,11 +9,11 @@
 
 
 int
-smatch(char *string, struct swit *swp)
+smatch(const char *string, const struct swit *swp)
 {
-    char *sp, *tcp;
+    const char *sp, *tcp;
     int firstone, len;
-    struct swit *tp;
+    const struct swit *tp;
 
     firstone = UNKWNSW;
 
@@ -31,16 +27,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;
     }