# HG changeset patch # User LordOfWar # Date 2009-10-09 13:52:38 # Node ID 249d80ebb87a1aadba53c64faece5c5927e79108 # Parent 9cfe67b5fe4668cc64eeb3cf9a46d426ac9a64be createQueueFromXML() now cleans up after itself like a good little function diff --git a/src/server/distrend.c b/src/server/distrend.c --- a/src/server/distrend.c +++ b/src/server/distrend.c @@ -522,7 +522,7 @@ int updateJobListXML(struct distrenjob * _distren_asprintf(&tmp, "job_list.xml"); writer = xmlNewTextWriterFilename(tmp, 0); - xmlTextWriterStartDocument(writer, NULL, "UTF-8", NULL); + xmlTextWriterStartDocument(writer, NULL, "utf-8", NULL); // create root element job_list xmlTextWriterStartElement(writer, (xmlChar*)"job_list"); @@ -552,7 +552,7 @@ int updateJobListXML(struct distrenjob * // and then adds the jobs to the queue, as if it were never shut down int createQueueFromXML(struct distrenjob *head) { - xmlChar *tmp2; + xmlChar *tmp; xmlDocPtr doc; // holds xml document in memory xmlNodePtr cur; // points to the current xml element node @@ -583,16 +583,16 @@ int createQueueFromXML(struct distrenjob // scans the list of all jobs that were in queue before DistRen shutdown while(cur != NULL) { - tmp2 = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); - fprintf(stderr, "adding job: %s", tmp2); + tmp = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); + fprintf(stderr, "adding job: %s", tmp); // add job from job number @TODO create function with parameters (struct distrenjob *head, int job_number) // LordOfWar calls dibs on above todo + xmlFree(tmp); cur = cur->next; // go to next child element of job_list element } xmlFreeDoc(doc); - xmlFree(tmp2); return 1; }