Просмотр исходного кода

Last updates form the original project

mingodad 12 лет назад
Родитель
Сommit
9c4b746385
5 измененных файлов с 7 добавлено и 5 удалено
  1. 1 1
      gumbo/error.c
  2. 1 1
      gumbo/gumbo.h
  3. 1 1
      gumbo/parser.c
  4. 3 1
      gumbo/tokenizer.c
  5. 1 1
      gumbo/util.c

+ 1 - 1
gumbo/error.c

@@ -135,7 +135,7 @@ static const char* find_next_newline(
 
 GumboError* gumbo_add_error(GumboParser* parser) {
   int max_errors = parser->_options->max_errors;
-  if (max_errors < 0 && parser->_output->errors.length >= max_errors) {
+  if (max_errors >= 0 && parser->_output->errors.length >= max_errors) {
     return NULL;
   }
   GumboError* error = gumbo_parser_allocate(parser, sizeof(GumboError));

+ 1 - 1
gumbo/gumbo.h

@@ -366,7 +366,7 @@ GumboTag gumbo_tag_enum(const char* tagname);
 /**
  * Attribute namespaces.
  * HTML includes special handling for XLink, XML, and XMLNS namespaces on
- * attributes.  Everything else goes in the generatic "NONE" namespace.
+ * attributes.  Everything else goes in the generic "NONE" namespace.
  */
 typedef enum {
   GUMBO_ATTR_NAMESPACE_NONE,

+ 1 - 1
gumbo/parser.c

@@ -43,7 +43,7 @@ static void* malloc_wrapper(void* unused, size_t size) {
 }
 
 static void free_wrapper(void* unused, void* ptr) {
-  return free(ptr);
+  free(ptr);
 }
 
 const GumboOptions kGumboDefaultOptions = {

+ 3 - 1
gumbo/tokenizer.c

@@ -442,7 +442,8 @@ static void finish_token(GumboParser* parser, GumboToken* token) {
   reset_token_start_point(tokenizer);
   token->original_text.length =
       tokenizer->_token_start - token->original_text.data;
-  if (token->original_text.length > 0 && token->original_text.data[token->original_text.length - 1] == '\r') {
+  if (token->original_text.length > 0 &&
+      token->original_text.data[token->original_text.length - 1] == '\r') {
     // The UTF8 iterator will ignore carriage returns in the input stream, which
     // means that the next token may start one past a \r character.  The pointer
     // arithmetic above results in that \r being appended to the original text
@@ -815,6 +816,7 @@ static void finish_attribute_value(GumboParser* parser) {
     // Duplicate attribute name detected in an earlier state, so we have to
     // ignore the value.
     tag_state->_drop_next_attr_value = false;
+    reinitialize_tag_buffer(parser);
     return;
   }
 

+ 1 - 1
gumbo/util.c

@@ -36,7 +36,7 @@ void* gumbo_parser_allocate(GumboParser* parser, size_t num_bytes) {
 }
 
 void gumbo_parser_deallocate(GumboParser* parser, void* ptr) {
-  return parser->_options->deallocator(parser->_options->userdata, ptr);
+  parser->_options->deallocator(parser->_options->userdata, ptr);
 }
 
 char* gumbo_copy_stringz(GumboParser* parser, const char* str) {