Changeset 10039

Timestamp:

2005-06-09T17:30:47+12:00 (19 years ago)

Author:

mdewsnip

Message:

Tidied up memory usage.

File:

• trunk/gsdl/src/recpt/gtiaction.cpp (modified) (7 diffs)

trunk/gsdl/src/recpt/gtiaction.cpp

@@ -430 +430 @@
     }
 
+    delete[] cgi_argument_name_cstr;
     ++cgi_argument;
   }
@@ -442 +443 @@
   do_gti_submission(gti_arguments, submission_text, logout);
   logout << "Done." << endl;
+
+  delete[] source_chunk_key_start_cstr;
+  delete[] target_chunk_key_start_cstr;
 }
 
@@ -559 +563 @@
   // Send the request to gti.pl and read the XML output
   text_t gti_command = "perl -S " + filename_cat(gsdlhome, "bin", "script", "gti.pl") + " " + gti_arguments;
-  FILE *gti_pipe = popen(gti_command.getcstr(), "r");
+  char* gti_command_cstr = gti_command.getcstr();
+  FILE *gti_pipe = popen(gti_command_cstr, "r");
+  delete[] gti_command_cstr;
   if (gti_pipe == NULL) {
     logout << "Error: Could not open pipe for GTI command " << gti_command << endl;
@@ -582 +588 @@
   char* gti_response_xml_text_cstr = gti_response_xml_text.getcstr();
   int parse_status = XML_Parse(xml_parser, gti_response_xml_text_cstr, strlen(gti_response_xml_text_cstr), XML_TRUE);
+  delete[] gti_response_xml_text_cstr;
   if (parse_status == XML_STATUS_ERROR) {
     logout << "Parse error " << XML_ErrorString(XML_GetErrorCode(xml_parser)) << " at line " << XML_GetCurrentLineNumber(xml_parser) << endl;
@@ -587 +594 @@
   }
 
-  free(gti_response_xml_text_cstr);
   XML_ParserFree(xml_parser);
 
@@ -600 +606 @@
   // Send the submission to gti.pl
   text_t gti_command = "perl -S " + filename_cat(gsdlhome, "bin", "script", "gti.pl") + " " + gti_arguments;
-  FILE *gti_pipe = popen(gti_command.getcstr(), "w");
+  char* gti_command_cstr = gti_command.getcstr();
+  FILE *gti_pipe = popen(gti_command_cstr, "w");
+  delete[] gti_command_cstr;
   if (gti_pipe == NULL) {
     logout << "Error: Could not open pipe for GTI command " << gti_command << endl;
@@ -609 +617 @@
   char* gti_submission_cstr = gti_submission.getcstr();
   fwrite(gti_submission_cstr, 1, strlen(gti_submission_cstr), gti_pipe);
-  free(gti_submission_cstr);
+  delete[] gti_submission_cstr;
 
   pclose(gti_pipe);