From d17c0d7813ec2f24be328fe1821fe6c48491df09 Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 24 May 2014 12:40:52 +0200 Subject: [PATCH] mystring.c, rewrite spos_() --- src/frontend/numparam/mystring.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/frontend/numparam/mystring.c b/src/frontend/numparam/mystring.c index 9fdd4cf97..c8ee2960a 100644 --- a/src/frontend/numparam/mystring.c +++ b/src/frontend/numparam/mystring.c @@ -589,14 +589,11 @@ absi(long i) int spos_(char *sub, const char *s) -/* equivalent to Turbo Pascal pos(). - BUG: counts 1 ... length(s), not from 0 like C -*/ { - char *ptr; + const char *ptr = strstr(s, sub); - if ((ptr = strstr(s, sub)) != NULL) - return (int) (strlen(s) - strlen(ptr)); + if (ptr) + return (int) (ptr - s); else return -1; }