httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Fri, 16 Jul 2004 16:12:23 GMT
bnicholes    2004/07/16 09:12:23

  Modified:    server   core.c
  Log:
  Replace the strsep() call to the more portable apr_strtok() call so that we can build again
  
  Revision  Changes    Path
  1.282     +4 -6      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.281
  retrieving revision 1.282
  diff -u -r1.281 -r1.282
  --- core.c	14 Jul 2004 06:36:42 -0000	1.281
  +++ core.c	16 Jul 2004 16:12:22 -0000	1.282
  @@ -1232,18 +1232,16 @@
       allow_options_t opt;
       int first = 1;
   
  -    char *p = (char *) l;
  +    char *w, *p = (char *) l;
  +    char *tok_state;
   
  -    while (p && *p) {
  -        char *w = strsep(&p, ",");
  +    while (w = apr_strtok(p, ",", &tok_state)) {
   
           if (first) {
  +            p = NULL;
               *opts = OPT_NONE;
               first = 0;
           }
  -
  -	if (!w)
  -	    continue;
   
           if (!strcasecmp(w, "Indexes")) {
               opt = OPT_INDEXES;
  
  
  

Mime
View raw message