xml output formatting

4 files changed, 112 insertions, 121 deletions

diff --git a/brlan.c b/brlan.c
index bb64c4d..49c5e39 100644
--- a/brlan.c
+++ b/brlan.c
@@ -36,59 +36,6 @@ char tag_types_rlmc_list[15][24];
 static size_t BRLAN_fileoffset = 0;
 FILE* xmlanout;
 
-const char *whitespace_cb(mxml_node_t *node, int where)
-{
-    const char *name;
-    name = node->value.element.name;
-
-    if (!strcmp(name, "xmlan"))
-    {
-	if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
-            return("\n");
-    }
-    if (!strcmp(name, "timg"))
-    {
-	if (where == MXML_WS_BEFORE_OPEN)
-            return("\n");
-    }
-    else if (!strcmp(name, "pane")) 
-    {
-        if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
-            return ("\n\t");
-    }
-    else if (!strcmp(name, "tag")) 
-    {
-        if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
-            return ("\n\t\t");
-    }
-    else if (!strcmp(name, "entry"))
-    {
-	if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
-            return ("\n\t\t\t");
-    }
-    else if (!strcmp(name, "triplet") ||
-             !strcmp(name, "pair"))
-    {
-	if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
-	  return ("\n\t\t\t\t");
-    }
-    else if (!strcmp(name, "frame") ||
-             !strcmp(name, "value") ||
-             !strcmp(name, "blend") ||
-             !strcmp(name, "data1") ||
-             !strcmp(name, "data2") ||
-             !strcmp(name, "padding"))
-    {
-	if (where == MXML_WS_BEFORE_OPEN)
-	  return ("\n\t\t\t\t\t");
-    }
-
-    /*
-     * Return NULL for no added whitespace...
-     */
-    return (NULL);
-}
-
 static void BRLAN_ReadDataFromMemoryX(void* destination, void* input, size_t size)
 {
     u8* out = (u8*)destination;
diff --git a/brlyt.c b/brlyt.c
index 75736b0..91b962b 100644
--- a/brlyt.c
+++ b/brlyt.c
@@ -51,73 +51,6 @@ char *textures;
 int numberOfTextures;
 int lengthOfTextures;
 
-const char *whitespace_cb(mxml_node_t *node, int where)
-{
-    const char *name;
-    name = node->value.element.name;
-
-    if (!strcmp(name, "xmlyt"))
-    {
-        if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
-            return("\n");
-    }
-    else if (!strcmp(name, "tag")) 
-    {
-        if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
-            return ("\n\t");
-    }
-    else if (!strcmp(name, "a") ||
-             !strcmp(name, "size") ||
-             !strcmp(name, "entries")) 
-    {
-        if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
-            return ("\n\t\t");
-    }
-    else if (!strcmp(name, "data") ||
-             !strcmp(name, "name"))
-    {
-        if ((where == MXML_WS_BEFORE_OPEN))
-            return ("\n\t\t\t");
-    }
-    else if (!strcmp(name, "colors") ||
-             !strcmp(name, "wrap_t") ||
-             !strcmp(name, "wrap_s") ||
-             !strcmp(name, "material"))
-    {
-        if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
-            return ("\n\t\t\t");
-    }
-    else if (!strcmp(name, "black_color") ||
-             !strcmp(name, "white_color") ||
-             !strcmp(name, "unk2") ||
-             !strcmp(name, "tev_k"))
-    {
-        if ((where == MXML_WS_BEFORE_OPEN))
-        {
-            return ("\n\t\t\t\t");
-        }
-    }
-    else if (!strcmp(name, "flags") ||
-             !strcmp(name, "ua2") ||
-             !strcmp(name, "ua3") ||
-             !strcmp(name, "ua4") ||
-             !strcmp(name, "ua5") ||
-             !strcmp(name, "ua6") ||
-             !strcmp(name, "ua7") ||
-             !strcmp(name, "ua8") ||
-             !strcmp(name, "ua9") ||
-             !strcmp(name, "uaa") ||
-             !strcmp(name, "uab"))
-    {
-        if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
-            return ("\n\t\t\t");
-    }
-    /*
-     * Return NULL for no added whitespace...
-     */
-    return (NULL);
-}
-
 static int FourCCsMatch(fourcc cc1, fourcc cc2)
 {
     dbgprintf("FourCCs\n");
diff --git a/xml.c b/xml.c
index cd04b34..7556937 100644
--- a/xml.c
+++ b/xml.c
@@ -17,7 +17,7 @@ get_value(mxml_node_t *node,        /* I - Node to get */
     
     ptr = (char*)buffer;
     end = (char*)buffer + buflen - 1;
-    char tempbuf[256];
+    char tempbuf[4092];
     current = node->child;
     for (current = node->child; current && ptr < end; current = current->next)
     {
@@ -66,3 +66,112 @@ get_value(mxml_node_t *node,        /* I - Node to get */
     *ptr = 0;
     return buffer;
 }
+
+const char *whitespace_cb(mxml_node_t *node, int where)
+{
+    const char *name;
+    name = node->value.element.name;
+
+    if (!strcmp(name, "xmlan"))
+    {
+	if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
+            return("\n");
+    }
+    if (!strcmp(name, "timg"))
+    {
+	if (where == MXML_WS_BEFORE_OPEN)
+            return("\n");
+    }
+    else if (!strcmp(name, "pane")) 
+    {
+        if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
+            return ("\n\t");
+    }
+    else if (!strcmp(name, "tag")) 
+    {
+        if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
+            return ("\n\t\t");
+    }
+    else if (!strcmp(name, "entry"))
+    {
+	if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
+            return ("\n\t\t\t");
+    }
+    else if (!strcmp(name, "triplet") ||
+             !strcmp(name, "pair"))
+    {
+	if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
+	  return ("\n\t\t\t\t");
+    }
+    else if (!strcmp(name, "frame") ||
+             !strcmp(name, "value") ||
+             !strcmp(name, "blend") ||
+             !strcmp(name, "data1") ||
+             !strcmp(name, "data2") ||
+             !strcmp(name, "padding"))
+    {
+	if (where == MXML_WS_BEFORE_OPEN)
+	  return ("\n\t\t\t\t\t");
+    }
+    else if (!strcmp(name, "xmlyt"))
+    {
+        if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
+            return("\n");
+    }
+    else if (!strcmp(name, "tag")) 
+    {
+        if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
+            return ("\n\t");
+    }
+    else if (!strcmp(name, "a") ||
+             !strcmp(name, "size") ||
+             !strcmp(name, "entries")) 
+    {
+        if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
+            return ("\n\t\t");
+    }
+    else if (!strcmp(name, "data") ||
+             !strcmp(name, "name"))
+    {
+        if ((where == MXML_WS_BEFORE_OPEN))
+            return ("\n\t\t\t");
+    }
+    else if (!strcmp(name, "colors") ||
+             !strcmp(name, "wrap_t") ||
+             !strcmp(name, "wrap_s") ||
+             !strcmp(name, "material"))
+    {
+        if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
+            return ("\n\t\t\t");
+    }
+    else if (!strcmp(name, "black_color") ||
+             !strcmp(name, "white_color") ||
+             !strcmp(name, "unk2") ||
+             !strcmp(name, "tev_k"))
+    {
+        if ((where == MXML_WS_BEFORE_OPEN))
+        {
+            return ("\n\t\t\t\t");
+        }
+    }
+    else if (!strcmp(name, "flags") ||
+             !strcmp(name, "ua2") ||
+             !strcmp(name, "ua3") ||
+             !strcmp(name, "ua4") ||
+             !strcmp(name, "ua5") ||
+             !strcmp(name, "ua6") ||
+             !strcmp(name, "ua7") ||
+             !strcmp(name, "ua8") ||
+             !strcmp(name, "ua9") ||
+             !strcmp(name, "uaa") ||
+             !strcmp(name, "uab"))
+    {
+        if ((where == MXML_WS_BEFORE_OPEN) || (where == MXML_WS_BEFORE_CLOSE))
+            return ("\n\t\t\t");
+    }
+    /*
+     * Return NULL for no added whitespace...
+     */
+    return (NULL);
+}
+
diff --git a/xml.h b/xml.h
index a5b8dcc..c256042 100755
--- a/xml.h
+++ b/xml.h
@@ -6,4 +6,6 @@ get_value(mxml_node_t *node,        /* I - Node to get */
       void        *buffer,        /* I - Buffer */
       int         buflen);        /* I - Size of buffer */
 
+const char *whitespace_cb(mxml_node_t *node, int where);
+
 #endif //_XML_H_