X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fttxml%2Fttxml.c;fp=ccan%2Fttxml%2Fttxml.c;h=5a0d457d33644d5ac23ec585f57c75a3c3a079d3;hp=4e1cbbd4d2bac4841fcc0a631570ef9cbde95742;hb=4cb3b393d7dd0c18fe2c738d9e4b0e58a93c6121;hpb=63afde339fdcc5cbd9df5e3e8419e62a0ad1e579

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