fixed inline function error

2 files changed, 120 insertions, 118 deletions

diff --git a/brlan.c b/brlan.c
index ac17eb5..bb64c4d 100644
--- a/brlan.c
+++ b/brlan.c
@@ -36,6 +36,59 @@ 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;
@@ -246,58 +299,6 @@ void parse_brlan(char* filename, char *filenameout)
 
     CreateGlobal_pai1(&pai1_header, pai1_header1, pai1_header2, pai1_header_type);
 
-    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);
-    }
 
     FILE *xmlFile;
     xmlFile = fopen(filenameout, "w");
diff --git a/brlyt.c b/brlyt.c
index 16b31c4..75736b0 100644
--- a/brlyt.c
+++ b/brlyt.c
@@ -51,6 +51,73 @@ 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");
@@ -856,72 +923,6 @@ void parse_brlyt(char *filename, char *filenameout)
         BRLYT_fileoffset += be32(tempentry.length);
     }    
 
-    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);
-    }
 
     FILE *xmlFile;
     xmlFile = fopen(filenameout, "w");