# HG changeset patch
# User Binki <ohnobinki@ohnopublishing.net>
# Date 2009-12-03 00:36:17
# Node ID 726c7e105f83b8117c67b3a58693175536f742e7
# Parent  4b53912fd49c8896ae6681913dbe8004d2c6fa1c

add struct distrend_config to struct general_info

diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -54,6 +54,8 @@ struct general_info
 {
   struct distrenjob head;
 
+  struct distrend_config *config;
+
   int jobs_in_queue;
   unsigned int free_clients;
   unsigned int rendering_clients;
@@ -1090,7 +1092,6 @@ int main(int argc, char *argv[])
 
   int cont;
   struct distrend_clientset *clients;
-  struct distrend_config *config;
 
   enum clientstatus
   {
@@ -1133,10 +1134,10 @@ int main(int argc, char *argv[])
     }
   cont = 1;
 
-  if(distrend_do_config(argc, argv, &config))
+  if(distrend_do_config(argc, argv, &general_info.config))
     return 1;
 
-  if(start_data(&general_info, config->datadir))
+  if(start_data(&general_info, general_info.config->datadir))
     {
       fprintf(stderr, "%s:%d: start_data() failed\n", __FILE__, __LINE__);
       return 1;
@@ -1222,14 +1223,14 @@ int main(int argc, char *argv[])
     }
   }
 
-  distrend_listen(config, &clients);
+  distrend_listen(general_info.config, &clients);
   /* This is called the "main loop" */
   while(cont)
     {
       struct distrend_action *action;
       int clientsays = 0; /*< temporary example variable, will be replaced when we can handle messages */
 
-      distrend_accept(config, clients, &action);
+      distrend_accept(general_info.config, clients, &action);
       cont = distrend_do(action);
 
       /* Make the following code more event-driven */
@@ -1260,8 +1261,8 @@ int main(int argc, char *argv[])
       distrend_action_free(action);
     }
 
-  distrend_unlisten(config->listens, clients);
-  distrend_config_free(config);
+  distrend_unlisten(general_info.config->listens, clients);
+  distrend_config_free(general_info.config);
 
   xmlcleanup();