Optimize num_tokens() to use only one pass through the string

[citadel.git] / webcit / tools.c

diff --git a/webcit/tools.c b/webcit/tools.c
index ff11a586b332d6d2e4df93bff7c2b2f8848b3d02..f0ebcaca5c08c34720d6ea7d9edd5476551a0a5e 100644 (file)
--- a/webcit/tools.c
+++ b/webcit/tools.c
@@ -45,15 +45,19 @@ char *safestrncpy(char *dest, const char *src, size_t n)
  */
 int num_tokens(char *source, char tok)
 {
-       int a = 0;
        int count = 1;
+       char *ptr = source;
 
-       if (source == NULL)
+       if (source == NULL) {
                return (0);
-       for (a = 0; a < strlen(source); ++a) {
-               if (source[a] == tok)
+       }
+
+       while (*ptr) {
+               if (*ptr++ == tok) {
                        ++count;
+               }
        }
+       
        return (count);
 }
 
@@ -186,9 +190,10 @@ long extract_long(const char *source, int parmnum)
  */
 int haschar(char *st,char ch)
 {
-       int a, b;
+       int a, b, len;
        b = 0;
-       for (a = 0; a < strlen(st); ++a)
+       len = strlen(st);
+       for (a = 0; a < len; ++a)
                if (st[a] == ch)
                        ++b;
        return (b);
@@ -213,10 +218,9 @@ char *memreadline(char *start, char *buf, int maxlen)
 
        while (1) {
                ch = *ptr++;
-               if ((len < (maxlen - 1)) && (ch != 13) && (ch != 10)) {
-                       buf[strlen(buf) + 1] = 0;
-                       buf[strlen(buf)] = ch;
-                       ++len;
+               if ((len + 1 < (maxlen)) && (ch != 13) && (ch != 10)) {
+                       buf[len++] = ch;
+                       buf[len] = 0;
                }
                if ((ch == 10) || (ch == 0)) {
                        return ptr;
@@ -235,26 +239,47 @@ char *memreadline(char *start, char *buf, int maxlen)
 int pattern2(char *search, char *patn)
 {
        int a;
-       for (a = 0; a < strlen(search); ++a) {
-               if (!strncasecmp(&search[a], patn, strlen(patn)))
+       int len, plen;
+       len = strlen (search);
+       plen = strlen (patn);
+       for (a = 0; a < len; ++a) {
+               if (!strncasecmp(&search[a], patn, plen))
                        return (a);
        }
        return (-1);
 }
 
 
+/**
+ * \brief Strip leading and trailing spaces from a string; with premeasured and adjusted length.
+ * \param buf the string to modify
+ * \param len length of the string. 
+ */
+void stripltlen(char *buf, int *len)
+{
+       int delta = 0;
+       if (*len == 0) return;
+       while ((*len > delta) && (isspace(buf[delta]))){
+               delta ++;
+       }
+       memmove (buf, &buf[delta], *len - delta + 1);
+       (*len) -=delta;
+
+       if (*len == 0) return;
+       while (isspace(buf[(*len) - 1])){
+               buf[--(*len)] = '\0';
+       }
+}
+
 /**
  * \brief Strip leading and trailing spaces from a string
  * \param buf the string to modify
  */
 void striplt(char *buf)
 {
-       if (strlen(buf) == 0) return;
-       while ((strlen(buf) > 0) && (isspace(buf[0])))
-               strcpy(buf, &buf[1]);
-       if (strlen(buf) == 0) return;
-       while (isspace(buf[strlen(buf) - 1]))
-               buf[strlen(buf) - 1] = 0;
+       int len;
+       len = strlen(buf);
+       stripltlen(buf, &len);
 }
 
 
@@ -316,12 +341,13 @@ void stripout(char *str, char leftboundary, char rightboundary)
        int a;
        int lb = (-1);
        int rb = (-1);
+       int len = strlen(str);
 
        do {
                lb = (-1);
                rb = (-1);
 
-               for (a = 0; a < strlen(str); ++a) {
+               for (a = 0; a < len; ++a) {
                        if (str[a] == leftboundary)
                                lb = a;
                        if (str[a] == rightboundary)
@@ -329,7 +355,8 @@ void stripout(char *str, char leftboundary, char rightboundary)
                }
 
                if ((lb > 0) && (rb > lb)) {
-                       strcpy(&str[lb - 1], &str[rb + 1]);
+                       memmove(&str[lb - 1], &str[rb + 1], len - rb);
+                       len -= (rb - lb + 2);
                }
 
        } while ((lb > 0) && (rb > lb));