DistRen Changeset - 5a096921e9e8 · protofusion repositories

Changeset - 5a096921e9e8

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

LordOfWar - 16 years ago 2009-10-07 12:38:28

attempting to fix warning generated in previous commit

1 file changed with 6 insertions and 5 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -427,109 +427,110 @@ int distrend_do_config(int argc, char *a @@
       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_SIMPLE_STR("datadir", NULL),
       CFG_END()
     };
   struct distrenjob *distrenjob;
   int tmp;
   xmlinit();
   /*
    * test xml2distrenjob()
    */
   tmp = xml2distrenjob(&distrenjob, "distrenjob.xml.example");
   if(tmp)
     fprintf(stderr, "xml2distrenjob() returned %d. Try to cd to distren/doc if you want to test out the xml2distrenjob() function. (This will only fix this error if the error is due to an inability of the xml library to access distrenjob.xml.example)\n\n", tmp);
   else
     fprintf(stderr, "using email ``%s'' for user ``%s'' -- reading in XML files and pulling data from them using libxml2+XPath works!!!\n", distrenjob->email, distrenjob->submitter);
   fprintf(stderr, "%s:%d running config\n", __FILE__, __LINE__);
   *config = malloc(sizeof(struct distrend_config));
   myopts[1].simple_value = &(*config)->datadir;
   options_init(argc, argv, &(*config)->mycfg, myopts, "server", &(*config)->options);
   fprintf(stderr, "using %s as datadir\n", (*config)->datadir);
   xmlcleanup();
   return 0;
+}
 int distrend_config_free(struct distrend_config *config)
+{
   options_free(config->options);
   free(config);
   return 0;
+}
 /* ************************** XML Functions ************************* */
 int makeSlaveDataXML(struct distrenjob *job, char *height, char *width)
+{
   xmlTextWriterPtr writer;
-  char *path_to_xml;
+  char *tmp;
-  _distren_asprintf(&path_to_xml, "stor/job%d/job_info.xml", job->jobnum);
+  _distren_asprintf(&tmp, "stor/job%d/job_info.xml", job->jobnum);
   // create xml document at the location path_to_xml with no compression
   writer = xmlNewTextWriterFilename(path_to_xml, 0);
   // create xml document at the location tmp with no compression
   writer = xmlNewTextWriterFilename(tmp, 0);
   xmlTextWriterStartDocument(writer, NULL, "UTF-8", NULL);
   // write resolution element and add its attributes
   xmlTextWriterStartElement(writer, (xmlChar*)"distrenjob");
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"name", (xmlChar*)job->name);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"submitter", (xmlChar*)job->submitter);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"priority", (xmlChar*)job->priority);
   _distren_asprintf(&tmp, "%d", job->priority);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"priority", (xmlChar*)tmp);
   // write resolution element and add its attributes
   xmlTextWriterStartElement(writer, (xmlChar*)"resolution");
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"width", (xmlChar*)height);
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"height", (xmlChar*)width);
   xmlTextWriterEndElement(writer);
   // end document
   xmlTextWriterEndDocument(writer);
   // free writer and save xml file to disk
   xmlFreeTextWriter(writer);
   return 1;
+}
 /* ************************** Test Functions ************************* */
 void printFrameInfo(struct frameset *frame)
+{
   char *status = "";
   switch(frame->status)
+  {
     case FRAMESETSTATUS_UNASSIGNED:
       _distren_asprintf(&status, "%s", "unassigned");
       break;
     case FRAMESETSTATUS_ASSIGNED:
       _distren_asprintf(&status, "%s", "assigned");
       break;
     case FRAMESETSTATUS_DONE:
       _distren_asprintf(&status, "%s", "completed");
       break;
     case FRAMESETSTATUS_CANCELED:
       _distren_asprintf(&status, "%s", "canceled");
+  }
   printf("frame #: %d --> %s", frame->num, status);
+}
 void printJob(struct distrenjob *job)
+{
   int counter;
   printf("frame_num: status");
   for(counter = 0; counter < job->total_frames; counter++)
+    {
       printFrameInfo(&job->frameset[counter]);
+    }
+}

0 comments (0 inline, 0 general)