httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-1.3/src/lib/expat-lite xmltok.c xmltok_impl.c
Date Wed, 09 Jun 1999 10:50:11 GMT
rse         99/06/09 03:50:10

  Modified:    src/lib/expat-lite xmltok.c xmltok_impl.c
  Log:
  Make egcc -Wshadow happy again.
  
  Revision  Changes    Path
  1.3       +3 -3      apache-1.3/src/lib/expat-lite/xmltok.c
  
  Index: xmltok.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/lib/expat-lite/xmltok.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xmltok.c	1999/06/02 07:15:04	1.2
  +++ xmltok.c	1999/06/09 10:50:07	1.3
  @@ -930,7 +930,7 @@
   			 const char **nextTokPtr)
   {
     int c;
  -  char open;
  +  char openchar;
     if (ptr == end) {
       *namePtr = 0;
       return 1;
  @@ -981,12 +981,12 @@
       *nextTokPtr = ptr;
       return 0;
     }
  -  open = c;
  +  openchar = c;
     ptr += enc->minBytesPerChar;
     *valPtr = ptr;
     for (;; ptr += enc->minBytesPerChar) {
       c = toAscii(enc, ptr, end);
  -    if (c == open)
  +    if (c == openchar)
         break;
       if (!('a' <= c && c <= 'z')
   	&& !('A' <= c && c <= 'Z')
  
  
  
  1.3       +13 -13    apache-1.3/src/lib/expat-lite/xmltok_impl.c
  
  Index: xmltok_impl.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/lib/expat-lite/xmltok_impl.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xmltok_impl.c	1999/06/02 07:15:04	1.2
  +++ xmltok_impl.c	1999/06/09 10:50:08	1.3
  @@ -593,7 +593,7 @@
       /* fall through */
       case BT_EQUALS:
         {
  -	int open;
  +	int opentype;
   #ifdef XML_NS
   	hadColon = 0;
   #endif
  @@ -602,10 +602,10 @@
   	  ptr += MINBPC(enc);
   	  if (ptr == end)
   	    return XML_TOK_PARTIAL;
  -	  open = BYTE_TYPE(enc, ptr);
  -	  if (open == BT_QUOT || open == BT_APOS)
  +	  opentype = BYTE_TYPE(enc, ptr);
  +	  if (opentype == BT_QUOT || opentype == BT_APOS)
   	    break;
  -	  switch (open) {
  +	  switch (opentype) {
   	  case BT_S:
   	  case BT_LF:
   	  case BT_CR:
  @@ -622,7 +622,7 @@
   	  if (ptr == end)
   	    return XML_TOK_PARTIAL;
   	  t = BYTE_TYPE(enc, ptr);
  -	  if (t == open)
  +	  if (t == opentype)
   	    break;
   	  switch (t) {
   	  INVALID_CASES(ptr, nextTokPtr)
  @@ -957,7 +957,7 @@
   }
   
   static
  -int PREFIX(scanLit)(int open, const ENCODING *enc,
  +int PREFIX(scanLit)(int opentype, const ENCODING *enc,
   		    const char *ptr, const char *end,
   		    const char **nextTokPtr)
   {
  @@ -968,7 +968,7 @@
       case BT_QUOT:
       case BT_APOS:
         ptr += MINBPC(enc);
  -      if (t != open)
  +      if (t != opentype)
   	break;
         if (ptr == end)
   	return XML_TOK_PARTIAL;
  @@ -1391,7 +1391,7 @@
   {
     enum { other, inName, inValue } state = inName;
     int nAtts = 0;
  -  int open = 0;
  +  int opentype = 0;
   
     for (ptr += MINBPC(enc);; ptr += MINBPC(enc)) {
       switch (BYTE_TYPE(enc, ptr)) {
  @@ -1418,9 +1418,9 @@
   	if (nAtts < attsMax)
   	  atts[nAtts].valuePtr = ptr + MINBPC(enc);
           state = inValue;
  -        open = BT_QUOT;
  +        opentype = BT_QUOT;
         }
  -      else if (open == BT_QUOT) {
  +      else if (opentype == BT_QUOT) {
           state = other;
   	if (nAtts < attsMax)
   	  atts[nAtts].valueEnd = ptr;
  @@ -1432,9 +1432,9 @@
   	if (nAtts < attsMax)
   	  atts[nAtts].valuePtr = ptr + MINBPC(enc);
           state = inValue;
  -        open = BT_APOS;
  +        opentype = BT_APOS;
         }
  -      else if (open == BT_APOS) {
  +      else if (opentype == BT_APOS) {
           state = other;
   	if (nAtts < attsMax)
   	  atts[nAtts].valueEnd = ptr;
  @@ -1454,7 +1454,7 @@
   	       && (ptr == atts[nAtts].valuePtr
   		   || BYTE_TO_ASCII(enc, ptr) != ' '
   		   || BYTE_TO_ASCII(enc, ptr + MINBPC(enc)) == ' '
  -	           || BYTE_TYPE(enc, ptr + MINBPC(enc)) == open))
  +	           || BYTE_TYPE(enc, ptr + MINBPC(enc)) == opentype))
   	atts[nAtts].normalized = 0;
         break;
       case BT_CR: case BT_LF:
  
  
  

Mime
View raw message