* Removed some dead code

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index f1385fca65b8b11af51d43cf167335a318da6ce7..e98bc70dabaf02b066b57a65a96a7be3da3a6ddf 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 621.36  2005/09/09 19:47:29  ajc
+* Removed some dead code
+
 Revision 621.35  2005/09/09 04:43:37  ajc
 *** empty log message ***
 
@@ -2929,3 +2932,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
+

diff --git a/webcit/mime_parser.c b/webcit/mime_parser.c
index e85d306974165458e2dcbf470aa11a9978fd3c82..1c82b001a2462b04673df5c80a9725d3920109c5 100644 (file)
--- a/webcit/mime_parser.c
+++ b/webcit/mime_parser.c
@@ -398,7 +398,6 @@ void the_mime_parser(char *partnum,
                part_start = NULL;
                do {
        
-                       /* next_boundary = bmstrstr(ptr, startary, memcmp); */
                        next_boundary = NULL;
                        for (srch=ptr; srch<content_end; ++srch) {
                                if (!memcmp(srch, startary, startary_len)) {

diff --git a/webcit/tools.c b/webcit/tools.c
index fc554d5e881642692f1b3eaff6042b05f981d634..2de3e881b61a37ebfa822d648f592dcda601d388 100644 (file)
--- a/webcit/tools.c
+++ b/webcit/tools.c
@@ -465,70 +465,3 @@ void generate_uuid(char *buf) {
                (seq++)
        );
 }
-
-
-
-/*
- * bmstrstr() is a variant of strstr() that uses the Boyer-Moore search
- * algorithm, and can use any caller-supplied string compare function whose
- * calling syntax is similar to strncmp().  For example, we can supply it
- * with strncasecmp() to do a case-insensitive search.
- * 
- * Original code: copyright (c) 1997-1998 by Urs Janssen <urs@tin.org>
- * Modifications: copyright (c) 2003 by Art Cancro <ajc@uncensored.citadel.org>
- */
-char *bmstrstr(char *text, char *pattern,
-       int (*cmpfunc)(const char *, const char *, size_t) )
-{
-       register unsigned char *p, *t;
-       register int i, j, *delta;
-       register size_t p1;
-       int deltaspace[256];
-       size_t textlen;
-       size_t patlen;
-
-       if (text == NULL) return(NULL);
-       if (pattern == NULL) return(NULL);
-
-       textlen = strlen(text);
-       patlen = strlen(pattern);
-
-       /* algorithm fails if pattern is empty */
-       if ((p1 = patlen) == 0)
-               return (text);
-
-       /* code below fails (whenever i is unsigned) if pattern too long */
-       if (p1 > textlen)
-               return (NULL);
-
-       /* set up deltas */
-       delta = deltaspace;
-       for (i = 0; i <= 255; i++)
-               delta[i] = p1;
-       for (p = (unsigned char *) pattern, i = p1; --i > 0;)
-               delta[*p++] = i;
-
-       /*
-        * From now on, we want patlen - 1.
-        * In the loop below, p points to the end of the pattern,
-        * t points to the end of the text to be tested against the
-        * pattern, and i counts the amount of text remaining, not
-        * including the part to be tested.
-        */
-       p1--;
-       p = (unsigned char *) pattern + p1;
-       t = (unsigned char *) text + p1;
-       i = textlen - patlen;
-       while (1) {
-               if (tolower(*p) == tolower(*t)
-                  && cmpfunc((p - p1), (t - p1), p1) == 0)
-                       return ((char *) t - p1);
-               j = delta[*t];
-               if (i < j)
-                       break;
-               i -= j;
-               t += j;
-       }
-       return (NULL);
-}
-

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 393646d524b9797c1a815ac5bf49a9a6d3050dbc..afd341d59a55f0798e1c3042b33c6834c9e7f607 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -336,8 +336,6 @@ void cookie_to_stuff(char *cookie, int *session,
                 char *user, size_t user_len,
                 char *pass, size_t pass_len,
                 char *room, size_t room_len);
-char *bmstrstr(char *text, char *pattern,
-        int (*cmpfunc)(const char *, const char *, size_t) );
 void locate_host(char *, int);
 void become_logged_in(char *, char *, char *);
 void do_login(void);