Changeset 9636 for trunk/gsdl

Timestamp:

2005-04-12T09:50:43+12:00 (19 years ago)

Author:

kjdon

Message:

delete -> delete [] changes submitted by Emanuel Dejanu

Location:

trunk/gsdl/src/w32server

Files:

• cgiwrapper.cpp (modified) (8 diffs)
• fnord.cpp (modified) (4 diffs)
• httpreq.cpp (modified) (1 diff)
• settings.cpp (modified) (4 diffs)

trunk/gsdl/src/w32server/cgiwrapper.cpp

@@ -299 +299 @@
           MB_OK | MB_TASKMODAL);
       
-      delete cstrmessage;
+      delete []cstrmessage;
       
       returnvalue = 0;
@@ -311 +311 @@
   
   // free the allocated C string
-  delete cstrthedir;
+  delete []cstrthedir;
   
   return returnvalue;
@@ -750 +750 @@
   char *filenamec = filename.getcstr();
   FILE *thefile = fopen(filenamec, "rb");
-  delete filenamec;
+  delete []filenamec;
   if (thefile == NULL) {
     log_message("file not found\n");
@@ -772 +772 @@
     }
   }
-  delete mimec;
+  delete []mimec;
   fclose(thefile);
 }
@@ -806 +806 @@
     char *response_data_c = response_data.getcstr();
     send_header(response_data_c, RInfo);
-    delete response_data_c;
+    delete []response_data_c;
     return;
   } else if (response == content) {
@@ -812 +812 @@
     char *response_data_c = response_data.getcstr();
     if (send_header(response_data_c, RInfo) < 0) {
-      delete response_data_c;
+      delete []response_data_c;
       return;
     }
-    delete response_data_c;
+    delete []response_data_c;
   }
   else if (response == undecided_location) {
@@ -885 +885 @@
       char *logstrc = logstr.getcstr();
       log_message (logstrc);
-      delete logstrc;
+      delete []logstrc;
     }
     
@@ -910 +910 @@
       char *logstrc = logstr.getcstr();
       log_message (logstrc);
-      delete logstrc;
+      delete []logstrc;
     }
     send_file_from_disk (tailstr, RequestInfo, RequestFields);

trunk/gsdl/src/w32server/fnord.cpp

@@ -365 +365 @@
       } else res = startbrowser (cstr_url, gsdl_browser_exe, startbrowserdir);
     
-      delete cstr_url;
+      delete []cstr_url;
 
     } else {
@@ -420 +420 @@
   char *gsdlhome = gsdl_gsdlhome.getcstr();
   strcpy (installpath, gsdlhome); // use gsdlhome to find the CD-ROM drive...
-  delete gsdlhome;
+  delete []gsdlhome;
   
   // remove any slashes from the pathname
@@ -486 +486 @@
   char *gsdlhome = gsdl_gsdlhome.getcstr();
   strcpy (topdir, gsdlhome); // use gsdlhome to find the CD-ROM drive...
-  delete gsdlhome;
+  delete []gsdlhome;
   strcpy (cmd, "notepad ");
   
@@ -646 +646 @@
     char *data_location_c = data_location.getcstr();
     strcpy (winsockpath, data_location_c);
-    delete data_location_c;
+    delete []data_location_c;
     
     // remove all the slashes at the end of billpath

trunk/gsdl/src/w32server/httpreq.cpp

@@ -409 +409 @@
       // to send a few extra bytes in certain situations we'll make sure we
       // slurp it all up here.
-      char *tmpbuffer = new char(100);
+      char *tmpbuffer = new char[100]; // this had new char(100)????
       //      unsigned long int nonblockmode=1;
       //      ioctlsocket(RequestInfo.ClientSocket, FIONBIO, &nonblockmode);
       d_recv(RequestInfo.ClientSocket, tmpbuffer, 100, 0);
-      delete tmpbuffer;
+      delete []tmpbuffer;
 
     }

trunk/gsdl/src/w32server/settings.cpp

@@ -92 +92 @@
   remove_end_slashes (cstr);
   str = cstr;
-  delete cstr;
+  delete []cstr;
 }
 
@@ -279 +279 @@
   char *conffile_c = gsdl_conffile.getcstr();
   ofstream fout (conffile_c);
-  delete conffile_c;
+  delete []conffile_c;
   if (fout) {
     
@@ -419 +419 @@
   ifstream conf (conffile_c);
 #endif
-  delete conffile_c;
+  delete []conffile_c;
   if (conf) {
     while (read_ini_line(conf, key, value) >= 0) {
@@ -488 +488 @@
       }
     }
-    delete cstr_value;
+    delete []cstr_value;
       }
     }