# HG changeset patch
# User Binki <ohnobinki@ohnopublishing.net>
# Date 2009-10-14 00:21:27
# Node ID b7292b0017bfedb7f07a893d24a7c8dd2a489bda
# Parent  725319a064efe63a94bcd5e4872f734dd1016252

reorganization for style and libxml2 usage

diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -483,7 +483,6 @@ int distrend_do_config(int argc, char *a
 
   int tmp;
 
-  xmlinit();
   /*
    * test xml2distrenjob()
    */
@@ -502,7 +501,6 @@ int distrend_do_config(int argc, char *a
 
   fprintf(stderr, "using %s as datadir\n", (*config)->datadir);
 
-  xmlcleanup();
   return 0;
 }
 int distrend_config_free(struct distrend_config *config)
@@ -897,24 +895,11 @@ int main(int argc, char *argv[])
 {
 
   /* Argument-parser */
-  int counter = 0;
-  int test = 0; // Have some fun if-ness that does fun stuff when this is 1
-
-  for(counter=0; counter<argc; counter++){
-         if(strcmp(argv[counter], "-h") == 0) {
-           fprintf(stderr, "Usage: distrend [option] \nStarts the distrend server\n\t-h\tshow this help\n\t-t\tlaunches queue testing interface \n");
-           return 2;
-          }
-
-          else if(strcmp(argv[counter], "-t") == 0) {
-            fprintf(stderr, "Entering into test mode...\n\n");
-            test=1;
-          }
-  }
+  int counter;
+  int test; // Have some fun if-ness that does fun stuff when this is 1
 
 
   struct distrenjob head;
-  head.priority = 0; // make head have the highest priority
 
   int cont;
   struct distrend_listenset *listenset;
@@ -927,12 +912,6 @@ int main(int argc, char *argv[])
     CLIENTSTATUS_IDLE = 2
   } clientstatus;
 
-  cont = 1;
-  memset(&head, '\0', sizeof(struct distrenjob));
-
-  start_data(&head); // Starts fresh or loads data from xml dump. Should we grab the return?
-
-  distrend_do_config(argc, argv, &config);
 
   int command;
   jobnum_t jobnum;
@@ -949,6 +928,34 @@ int main(int argc, char *argv[])
   int end_frame;
   size_t read_buf;
 
+  head.priority = 0; // make head have the highest priority
+
+  xmlinit();
+
+  test = 0;
+  for(counter = 0; counter < argc; counter ++)
+    {
+      if(strcmp(argv[counter], "-h") == 0)
+	{
+	  fprintf(stderr, "Usage: distrend [option] \nStarts the distrend server\n\t-h\tshow this help\n\t-t\tlaunches queue testing interface \n");
+	  return 2;
+	}
+      
+      else if(strcmp(argv[counter], "-t") == 0)
+	{
+	  fprintf(stderr, "Entering into test mode...\n\n");
+	  test=1;
+	}
+    }
+  cont = 1;
+  memset(&head, '\0', sizeof(struct distrenjob));
+  
+  start_data(&head); // Starts fresh or loads data from xml dump. Should we grab the return?
+
+  distrend_do_config(argc, argv, &config);
+
+
+
   while(test == 1)
   {
     fprintf(stderr, "Welcome to DistRen Alpha Interactive Test Mode\n\n");
@@ -1052,5 +1059,7 @@ int main(int argc, char *argv[])
   distrend_unlisten(listenset);
   distrend_config_free(config);
 
+  xmlcleanup();
+
   return 0;
 }