hx_changes_xmltok.diff

来自「symbian 下的helix player源代码」· DIFF 代码 · 共 575 行 · 第 1/2 页

       hadColon = 1;
       ptr += MINBPC(enc);
@@ -566,7 +566,7 @@
       CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr)
       default:
 	*nextTokPtr = ptr;
-	return XML_TOK_ERR_INVALID_NAME;
+	return XML_TOK_INVALID;
       }
       break;
 #endif
@@ -587,7 +587,7 @@
 	  break;
 	default:
 	  *nextTokPtr = ptr;
-	  return XML_TOK_ERR_MISSING_EQUALS;
+	  return XML_TOK_INVALID;
 	}
       }
     /* fall through */
@@ -612,7 +612,7 @@
 	    break;
 	  default:
 	    *nextTokPtr = ptr;
-	    return XML_TOK_ERR_MISSING_QUOT_APOS;
+	    return XML_TOK_INVALID;
 	  }
 	}
 	ptr += MINBPC(enc);
@@ -630,9 +630,7 @@
 	    {
 	      int tok = PREFIX(scanRef)(enc, ptr + MINBPC(enc), end, &ptr);
 	      if (tok <= 0) {
-	        if (tok == XML_TOK_ERR_INVALID_HEX_CHAR_REF || 
-	            tok == XML_TOK_ERR_INVALID_CHAR_REF ||
-		    tok == XML_TOK_ERR_INVALID_REF)
+		if (tok == XML_TOK_INVALID)
 		  *nextTokPtr = ptr;
 		return tok;
 	      }
@@ -640,7 +638,7 @@
 	    }
 	  case BT_LT:
 	    *nextTokPtr = ptr;
-	    return XML_TOK_ERR_LT_NOT_ALLOWED;
+	    return XML_TOK_INVALID;
 	  default:
 	    ptr += MINBPC(enc);
 	    break;
@@ -660,7 +658,7 @@
 	  goto gt;
 	default:
 	  *nextTokPtr = ptr;
-	  return XML_TOK_ERR_MISSING_REQ_SPACE;
+	  return XML_TOK_INVALID;
 	}
 	/* ptr points to closing quote */
 	for (;;) {
@@ -682,13 +680,13 @@
 	      return XML_TOK_PARTIAL;
 	    if (!CHAR_MATCHES(enc, ptr, '>')) {
 	      *nextTokPtr = ptr;
-	      return XML_TOK_ERR_EXPECTED_GT;
+	      return XML_TOK_INVALID;
 	    }
 	    *nextTokPtr = ptr + MINBPC(enc);
 	    return XML_TOK_EMPTY_ELEMENT_WITH_ATTS;
 	  default:
 	    *nextTokPtr = ptr;
-	    return XML_TOK_ERR_INVALID_NAME;
+	    return XML_TOK_INVALID;
 	  }
 	  break;
 	}
@@ -696,10 +694,7 @@
       }
     default:
       *nextTokPtr = ptr;
-      /* As soon as we hit a space we would go to the space 
-	 state... so therefore this erro should be because we
-	 have ran into an invalid name token */
-      return XML_TOK_ERR_INVALID_NAME;
+      return XML_TOK_INVALID;
     }
   }
   return XML_TOK_PARTIAL;
@@ -728,14 +723,14 @@
       return PREFIX(scanCdataSection)(enc, ptr + MINBPC(enc), end, nextTokPtr);
     }
     *nextTokPtr = ptr;
-    return XML_TOK_ERR_INVALID_NAME;
+    return XML_TOK_INVALID;
   case BT_QUEST:
     return PREFIX(scanPi)(enc, ptr + MINBPC(enc), end, nextTokPtr);
   case BT_SOL:
     return PREFIX(scanEndTag)(enc, ptr + MINBPC(enc), end, nextTokPtr);
   default:
     *nextTokPtr = ptr;
-    return XML_TOK_ERR_INVALID_NAME;
+    return XML_TOK_INVALID;
   }
 #ifdef XML_NS
   hadColon = 0;
@@ -748,7 +743,7 @@
     case BT_COLON:
       if (hadColon) {
 	*nextTokPtr = ptr;
-	return XML_TOK_ERR_INVALID_NAME;
+	return XML_TOK_INVALID;
       }
       hadColon = 1;
       ptr += MINBPC(enc);
@@ -758,7 +753,7 @@
       CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr)
       default:
         *nextTokPtr = ptr;
-        return XML_TOK_ERR_INVALID_NAME;
+        return XML_TOK_INVALID;
       }
       break;
 #endif
@@ -777,7 +772,7 @@
 	    continue;
 	  default:
 	    *nextTokPtr = ptr;
-	    return XML_TOK_ERR_INVALID_NAME;
+	    return XML_TOK_INVALID;
 	  }
 	  return PREFIX(scanAtts)(enc, ptr, end, nextTokPtr);
 	}
@@ -794,13 +789,13 @@
 	return XML_TOK_PARTIAL;
       if (!CHAR_MATCHES(enc, ptr, '>')) {
 	*nextTokPtr = ptr;
-	return XML_TOK_ERR_EXPECTED_GT;
+	return XML_TOK_INVALID;
       }
       *nextTokPtr = ptr + MINBPC(enc);
       return XML_TOK_EMPTY_ELEMENT_NO_ATTS;
     default:
       *nextTokPtr = ptr;
-      return XML_TOK_ERR_INVALID_NAME;
+      return XML_TOK_INVALID;
     }
   }
   return XML_TOK_PARTIAL;
@@ -851,7 +846,7 @@
       break;
     }
     *nextTokPtr = ptr;
-    return XML_TOK_ERR_INVALID_GT_AFFT_2_RSQB_IN_CONTENT;
+    return XML_TOK_INVALID;
   INVALID_CASES(ptr, nextTokPtr)
   default:
     ptr += MINBPC(enc);
@@ -881,7 +876,7 @@
 	     break;
 	   }
 	   *nextTokPtr = ptr + 2*MINBPC(enc);
-	   return XML_TOK_ERR_INVALID_GT_AFFT_2_RSQB_IN_CONTENT;
+	   return XML_TOK_INVALID;
 	 }
       }
       /* fall through */
@@ -918,7 +913,7 @@
     return XML_TOK_PERCENT;
   default:
     *nextTokPtr = ptr;
-    return XML_TOK_ERR_INVALID_NAME;
+    return XML_TOK_INVALID;
   }
   while (ptr != end) {
     switch (BYTE_TYPE(enc, ptr)) {
@@ -928,7 +923,7 @@
       return XML_TOK_PARAM_ENTITY_REF;
     default:
       *nextTokPtr = ptr;
-      return XML_TOK_ERR_INVALID_NAME;
+      return XML_TOK_INVALID;
     }
   }
   return XML_TOK_PARTIAL;
@@ -944,7 +939,7 @@
   CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr)
   default:
     *nextTokPtr = ptr;
-    return XML_TOK_ERR_INVALID_NAME;
+    return XML_TOK_INVALID;
   }
   while (ptr != end) {
     switch (BYTE_TYPE(enc, ptr)) {
@@ -955,7 +950,7 @@
       return XML_TOK_POUND_NAME;
     default:
       *nextTokPtr = ptr;
-      return XML_TOK_ERR_INVALID_NAME;
+      return XML_TOK_INVALID;
     }
   }
   return -XML_TOK_POUND_NAME;
@@ -983,7 +978,7 @@
       case BT_GT: case BT_PERCNT: case BT_LSQB:
 	return XML_TOK_LITERAL;
       default:
-	return XML_TOK_ERR_INVALID_CHAR_IN_DOC;
+	return XML_TOK_INVALID;
       }
     default:
       ptr += MINBPC(enc);
@@ -1034,7 +1029,7 @@
 	return XML_TOK_INSTANCE_START;
       }
       *nextTokPtr = ptr;
-      return XML_TOK_ERR_INVALID_CHAR_IN_DOC;
+      return XML_TOK_INVALID;
     }
   case BT_CR:
     if (ptr + MINBPC(enc) == end)
@@ -1106,7 +1101,7 @@
       return XML_TOK_CLOSE_PAREN;
     }
     *nextTokPtr = ptr;
-    return XML_TOK_ERR_INVALID_CHAR_IN_DOC;
+    return XML_TOK_INVALID;
   case BT_VERBAR:
     *nextTokPtr = ptr + MINBPC(enc);
     return XML_TOK_OR;
@@ -1130,7 +1125,7 @@
       break; \
     } \
     *nextTokPtr = ptr; \
-    return XML_TOK_ERR_INVALID_CHAR_IN_DOC;
+    return XML_TOK_INVALID;
     LEAD_CASE(2) LEAD_CASE(3) LEAD_CASE(4)
 #undef LEAD_CASE
   case BT_NMSTRT:
@@ -1161,7 +1156,7 @@
     /* fall through */
   default:
     *nextTokPtr = ptr;
-    return XML_TOK_ERR_INVALID_CHAR_IN_DOC;
+    return XML_TOK_INVALID;
   }
   while (ptr != end) {
     switch (BYTE_TYPE(enc, ptr)) {
@@ -1195,27 +1190,27 @@
     case BT_PLUS:
       if (tok == XML_TOK_NMTOKEN)  {
 	*nextTokPtr = ptr;
-	return XML_TOK_ERR_INVALID_CHAR_IN_DOC;
+	return XML_TOK_INVALID;
       }
       *nextTokPtr = ptr + MINBPC(enc);
       return XML_TOK_NAME_PLUS;
     case BT_AST:
       if (tok == XML_TOK_NMTOKEN)  {
 	*nextTokPtr = ptr;
-	return XML_TOK_ERR_INVALID_CHAR_IN_DOC;
+	return XML_TOK_INVALID;
       }
       *nextTokPtr = ptr + MINBPC(enc);
       return XML_TOK_NAME_ASTERISK;
     case BT_QUEST:
       if (tok == XML_TOK_NMTOKEN)  {
 	*nextTokPtr = ptr;
-	return XML_TOK_ERR_INVALID_CHAR_IN_DOC;
+	return XML_TOK_INVALID;
       }
       *nextTokPtr = ptr + MINBPC(enc);
       return XML_TOK_NAME_QUESTION;
     default:
       *nextTokPtr = ptr;
-      return XML_TOK_ERR_INVALID_CHAR_IN_DOC;
+      return XML_TOK_INVALID;
     }
   }
   return -tok;
@@ -1243,7 +1238,7 @@
     case BT_LT:
       /* this is for inside entity references */
       *nextTokPtr = ptr;
-      return XML_TOK_ERR_LT_NOT_ALLOWED;
+      return XML_TOK_INVALID;
     case BT_LF:
       if (ptr == start) {
 	*nextTokPtr = ptr + MINBPC(enc);