CVS gsasl/lib/digest-md5

[gsasl-commit]

Update of /home/cvs/gsasl/lib/digest-md5
In directory dopio:/tmp/cvs-serv30821

Modified Files:
        parser.c 
Log Message:
Remove getsubopt (in getsubopt.c now).


--- /home/cvs/gsasl/lib/digest-md5/parser.c     2004/12/19 01:45:41     1.3
+++ /home/cvs/gsasl/lib/digest-md5/parser.c     2004/12/19 02:09:49     1.4
@@ -33,91 +33,6 @@
 /* Get memcpy, strlen. */
 #include <string.h>
 
-/* Parse comma separate list into words.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
-   From the GNU C Library, under GNU LGPL version 2.1.
-   Contributed by Ulrich Drepper <address@hidden>, 1996.
-   Modified for Libgsasl by Simon Josefsson <address@hidden>
-   Copyright (C) 2002  Simon Josefsson
-
-   Parse comma separated suboption from *OPTIONP and match against
-   strings in TOKENS.  If found return index and set *VALUEP to
-   optional value introduced by an equal sign.  If the suboption is
-   not part of TOKENS return in *VALUEP beginning of unknown
-   suboption.  On exit *OPTIONP is set to the beginning of the next
-   token or at the terminating NUL character.  */
-static int
-digest_md5_getsubopt (char **optionp,
-                     const char *const *tokens,
-                     char **valuep)
-{
-  char *endp, *vstart;
-  int cnt;
-  int inside_quote = 0;
-
-  if (**optionp == '\0')
-    return -1;
-
-  /* Find end of next token.  */
-  endp = *optionp;
-  while (*endp != '\0' && (inside_quote || (!inside_quote && *endp != ',')))
-    {
-      if (*endp == '"')
-       inside_quote = !inside_quote;
-      endp++;
-    }
-
-  /* Find start of value.  */
-  vstart = memchr (*optionp, '=', endp - *optionp);
-  if (vstart == NULL)
-    vstart = endp;
-
-  /* Try to match the characters between *OPTIONP and VSTART against
-     one of the TOKENS.  */
-  for (cnt = 0; tokens[cnt] != NULL; ++cnt)
-    if (memcmp (*optionp, tokens[cnt], vstart - *optionp) == 0
-       && tokens[cnt][vstart - *optionp] == '\0')
-      {
-       /* We found the current option in TOKENS.  */
-       *valuep = vstart != endp ? vstart + 1 : NULL;
-
-       while (*valuep && (**valuep == ' ' ||
-                          **valuep == '\t' ||
-                          **valuep == '\r' ||
-                          **valuep == '\n' || **valuep == '"'))
-         (*valuep)++;
-
-       if (*endp != '\0')
-         {
-           *endp = '\0';
-           *optionp = endp + 1;
-         }
-       else
-         *optionp = endp;
-       endp--;
-       while (*endp == ' ' ||
-              *endp == '\t' ||
-              *endp == '\r' || *endp == '\n' || *endp == '"')
-         *endp-- = '\0';
-       while (**optionp == ' ' ||
-              **optionp == '\t' || **optionp == '\r' || **optionp == '\n')
-         (*optionp)++;
-
-       return cnt;
-      }
-
-  /* The current suboption does not match any option.  */
-  *valuep = *optionp;
-
-  if (*endp != '\0')
-    *endp++ = '\0';
-  *optionp = endp;
-  while (**optionp == ' ' ||
-        **optionp == '\t' || **optionp == '\r' || **optionp == '\n')
-    (*optionp)++;
-
-  return -1;
-}
 #define DEFAULT_CHARSET "utf-8"
 #define DEFAULT_ALGORITHM "md5-sess"