Changeset 4723Tweet

Timestamp:

Feb 1, 2011, 1:59:39 PM (9 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Indentation
• Free libxml2's tree after use

Location:

gaycko/trunk/src

Files:

• dom/dom.c (modified) (6 diffs)
• parsing/parse.c (modified) (1 diff)

gaycko/trunk/src/dom/dom.c

@@ -29 +29 @@
         e->children_count  = 0;
         e->children        = NULL;
-    e->attribute_count = 0;
+        e->attribute_count = 0;
         e->attributes      = NULL;
-    
+
         e->name = (char*)strdup((const char*)node->name);
 
@@ -51 +51 @@
                 e->type = ELEM_P;
         }else if(!strncmp(e->name, "img", 3)) {
-                e->type = ELEM_IMG;
-        }else if(!strncmp(e->name, "text", 4)) {
+                e->type = ELEM_IMG;
+        }else if(!strncmp(e->name, "text", 4)) {
                 e->type = ELEM_TEXT;
                 e->text = (char*)strdup((const char*)xmlNodeGetContent(node));
-            strip_eol(e->text);
-            strip_spaces(e->text);
+                strip_eol(e->text);
+                strip_spaces(e->text);
         }else {
                 e->type = ELEM_UNKNOW;
                 printf("Unknow tag '%s'\n", e->name);   
         }
-    
-    if(node->properties) {
-        for(xmlAttrPtr attr = node->properties; attr != NULL; attr = attr->next) {
-            e->attributes = realloc(e->attributes, sizeof(gAttribute));
-            e->attributes[e->attribute_count].name = strdup(attr->name);
-            e->attributes[e->attribute_count].value = strdup(attr->children->content);
-        }
-    }
-    
+
+        if(node->properties) {
+                for(xmlAttrPtr attr = node->properties; attr != NULL; attr = attr->next) {
+                        e->attributes = realloc(e->attributes, sizeof(gAttribute));
+                        e->attributes[e->attribute_count].name = strdup(attr->name);
+                        e->attributes[e->attribute_count].value = strdup(attr->children->content);
+                }
+        }
+
         return e;
 }
@@ -81 +81 @@
                 gElement *child = add_element(node);
                 child->level = level;
-        
+
                 if(elem) elem  = realloc(elem, sizeof(gElement*)*(c+1));
                 else elem = malloc(sizeof(gElement*));
@@ -94 +94 @@
                         if(node->children != NULL) {
                                 explore(child->children,
-                                        node->children,
-                                        level+1,
-                                        child);
+                                                node->children,
+                                                level+1,
+                                                child);
                         } else {
                                 free(child->children);
@@ -125 +125 @@
                 LEVEL printf("<%s>\n", elem->name);
         }
-        
+
         unsigned int i;
         for(i=0; i < elem->children_count; i++) {
@@ -138 +138 @@
 }
 
-
-#if 0
-if(xmlStrcasecmp(node->name, (const xmlChar*)"A") == 0)
-{
-        for(xmlAttrPtr attr = node->properties; attr != NULL; attr = attr->next)
-        {
-                if(xmlStrcasecmp(attr->name, (const xmlChar*)"HREF") == 0)
-                {
-                        printf("Found link <%s>\n", node->children->content);
-                }
-        }
-}
-#endif
-

gaycko/trunk/src/parsing/parse.c

@@ -27 +27 @@
         /* Actual parsing */
         htmlDocPtr doc = htmlParseDoc((unsigned char*)output.bp, NULL);
-
-
-        //tidyBufFree( &output );
-        //tidyBufFree( &errbuf );
+        
+        /* Release tidy document */
         tidyRelease( tdoc );
 
+        /* Convert libxml2's tree to our own DOM */
+        gDOM *dom = gaycko_convert_dom(doc);
 
-        gDOM *dom = gaycko_convert_dom(doc);
+        /* Free libxml2 tree */
+        xmlFreeDoc(doc);
 
         return dom;