DistRen Changeset - 91e3a9a0628e · protofusion repositories

Changeset - 91e3a9a0628e

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2009-08-02 22:45:14
ohnobinki@ohnopublishing.net

distrend_do_config(): fix pointer usage

1 file changed with 4 insertions and 4 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -430,102 +430,102 @@ void blendjob_remove(struct blendjob **h @@
       for(previous_blendjob = *head;
 	  previous_blendjob
 	    && previous_blendjob->next != bj; /*< stop on the blendjob that comes before bj */
 	  previous_blendjob = previous_blendjob->next)
 	/* all of the action is in the definition of the for loop itself */;
       /*
 	This removes references to bj from the linked list. I.E., we now skip bj when iterating through the list
        */
       previous_blendjob->next = bj->next;
+    }
   /*
      @lordofwar: the magic deallocation of memory ;-)
    */
   free(bj);
+}
 /* ************************** Main ************************* */
 // Begin non-working framework?
 	int distrend_do_config(int argc, char *argv[], struct distrend_config *config)
+	int distrend_do_config(int argc, char *argv[], struct distrend_config **config)
+	{
 	  cfg_opt_t myopts_listen[] =
+	    {
 	      CFG_SIMPLE_STR("type", NULL),
 	      CFG_SIMPLE_STR("path", NULL),
 	      CFG_SIMPLE_INT("port", NULL),
 	      CFG_END()
 	  };
 	  cfg_opt_t myopts[] =
+	    {
 	      CFG_SEC("listen",  /* this must be imported into struct listens (which must still be declared) */
 		      myopts_listen
+		      ,
 		      CFGF_MULTI),
 	      CFG_END()
 	    };
 	  config = malloc(sizeof(struct distrend_config));
 	  options_init(argc, argv, &config->mycfg, myopts, "server", &config->options);
 	  *config = malloc(sizeof(struct distrend_config));
 	  options_init(argc, argv, &(*config)->mycfg, myopts, "server", &(*config)->options);
 	  return 0;
+	}
 	int distrend_config_free(struct distrend_config *config)
+	{
 	  options_free(config->options);
 	  free(config);
 	  return 0;
+	}
 // End non-working framework?
 int main(int argc, char *argv[])
+{
   /* TODO: Put some arg-grabbing code here */
   struct blendjob *head;
   int cont;
   struct distrend_listenset *listenset;
   struct distrend_config *config;
   enum clientstatus
+  {
     CLIENTSTATUS_UNINITIALIZED = 0,
     CLIENTSTATUS_BUSY = 1,
     CLIENTSTATUS_IDLE = 2
   } clientstatus;
   head = NULL;
   cont = 1;
   distrend_do_config(argc, argv, config);
+  distrend_do_config(argc, argv, &config);
   distrend_listen(&listenset, config);
   /* This is called the ``main loop'' */
   while(cont)
+    {
       struct distren_action *action;
       int clientsays; /*< temporary example variable, will be replaced when we can handle messages */
       distrend_accept(&action);
       cont = distrend_do(action);
       /* Somewhat Pseudo-code for basic server operation, should be more event-driven */
       start_data();
       status_report_generator(&head);
       blend_frame_watchdog(head);
       struct frameset *frame;
       struct blendjob *job;
       /* If the client is idle (meaning a client without the "busy" status connected via ssh), all clients should be idle by default. */
       if(clientstatus == CLIENTSTATUS_IDLE)

0 comments (0 inline, 0 general)