ttxml: modified it to use a smaller buffer during testing

[ccan] / ccan / ttxml / ttxml.c

diff --git a/ccan/ttxml/ttxml.c b/ccan/ttxml/ttxml.c
index 4e1cbbd4d2bac4841fcc0a631570ef9cbde95742..5a0d457d33644d5ac23ec585f57c75a3c3a079d3 100644 (file)
--- a/ccan/ttxml/ttxml.c
+++ b/ccan/ttxml/ttxml.c
@@ -6,8 +6,10 @@
 \r
 #include "ttxml.h"\r
 \r
-\r
+#ifndef BUFFER\r
 #define BUFFER 3264\r
+#endif\r
+\r
 \r
 #define XML_LETTER     1\r
 #define XML_NUMBER     2\r
@@ -33,7 +35,7 @@ typedef struct XMLBUF
 \r
 \r
 /* Allocate a new XmlNode */\r
-XmlNode* xml_new(char * name)\r
+static XmlNode* xml_new(char * name)\r
 {\r
        XmlNode * ret = malloc(sizeof(XmlNode));\r
        if(!ret)return NULL;\r
@@ -95,7 +97,6 @@ static void xml_read_file(XMLBUF *xml)
        size = fread( xml->buf, 1, xml->len, xml->fptr);\r
        if( size != xml->len )\r
        {\r
-               printf("Buffer reduction\n");\r
                xml->len = size;\r
                xml->buf[size]=0;\r
                xml->eof = 1;\r
@@ -333,10 +334,7 @@ XmlNode* xml_load(const char * filename)
        xml.read_index = 0;\r
        xml.fptr = fopen(filename, "rb");\r
        if(!xml.fptr)\r
-       {\r
-               printf("Opening file failed\n");\r
                return NULL;\r
-       }\r
 \r
        xml.buf = malloc(BUFFER+1);\r
        xml.buf[BUFFER]=0;\r
@@ -384,59 +382,3 @@ char* xml_attr(XmlNode *x, const char *name)
 }\r
 \r
 \r
-#ifdef TEST\r
-/* print out the heirarchy of an XML file, useful for debugging */\r
-void xp(XmlNode *x, int level, int max)\r
-{\r
-       int i;\r
-       char text[] = "text";\r
-       char *name = text;\r
-       if(level > max)return;\r
-       if(!x)return;\r
-       if(x->name)name = x->name;\r
-       for(i=0; i<level; i++)printf("    ");\r
-       printf("%s:", name);\r
-       if(x->name)\r
-       for(i=0; i<x->nattrib; i++)\r
-               printf("%s=\"%s\",", x->attrib[i*2], x->attrib[i*2+1]);\r
-       else printf("%s", x->attrib[0]);\r
-       printf("\n");\r
-       if(x->child)xp(x->child, level+1, max);\r
-       if(x->next)xp(x->next, level, max);\r
-}\r
-\r
-\r
-int main(int argc, char *argv[])\r
-{\r
-       XmlNode *x, *tmp;\r
-       \r
-       if(!argv[1])\r
-       {\r
-               printf("USAGE: %s name\n\t reads name where name is an XML file.\n",\r
-                               argv[0]);\r
-               return 1;\r
-       }\r
-\r
-#ifdef PROFILE\r
-       for(int i=0; i<1000; i++)\r
-       {\r
-#endif\r
-               x = xml_load(argv[1]);\r
-\r
-               if(!x)\r
-               {\r
-                       printf("Failed to load.\n");\r
-                       return 2;\r
-               }\r
-#ifndef PROFILE\r
-               xp(x, 1, 20);\r
-#endif\r
-               xml_free(x);\r
-#ifdef PROFILE\r
-       }\r
-#endif\r
-\r
-       return 0;\r
-}\r
-#endif\r
-\r