tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/common jk_map.c
Date Sat, 12 Feb 2005 19:24:08 GMT
mturk       2005/02/12 11:24:08

  Modified:    jk/native/common jk_map.c
  Log:
  Do not use asterisk as delimiting char for lists.
  
  Revision  Changes    Path
  1.28      +7 -5      jakarta-tomcat-connectors/jk/native/common/jk_map.c
  
  Index: jk_map.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- jk_map.c	12 Feb 2005 17:04:57 -0000	1.27
  +++ jk_map.c	12 Feb 2005 19:24:08 -0000	1.28
  @@ -244,6 +244,7 @@
   {
       const char *l = jk_map_get_string(m, name, def);
       char **ar = NULL;
  +
   #if defined(AS400) || defined(_REENTRANT)
       char *lasts;
   #endif
  @@ -253,6 +254,7 @@
       if (l) {
           unsigned capacity = 0;
           unsigned idex = 0;
  +        char *p;
           char *v = jk_pool_strdup(&m->p, l);
   
           if (!v) {
  @@ -264,10 +266,10 @@
            * strtok also by a "*"
            */
   #if defined(AS400) || defined(_REENTRANT)
  -        for (l = strtok_r(v, " \t,*", &lasts);
  -             l; l = strtok_r(NULL, " \t,*", &lasts))
  +        for (p = strtok_r(v, " \t,", &lasts);
  +             p; p = strtok_r(NULL, " \t,", &lasts))
   #else
  -        for (l = strtok(v, " \t,*"); l; l = strtok(NULL, " \t,*"))
  +        for (p = strtok(v, " \t,"); p; p = strtok(NULL, " \t,"))
   #endif
   
           {
  @@ -281,7 +283,7 @@
                   }
                   capacity += 5;
               }
  -            ar[idex] = jk_pool_strdup(&m->p, l);
  +            ar[idex] = jk_pool_strdup(&m->p, p);
               idex++;
           }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message