Browse Source

Merge /u/jrubio/cdesktopenv/ branch delete-incomplete into master

https://sourceforge.net/p/cdesktopenv/code/merge-requests/18/
Jon Trulson 4 years ago
parent
commit
08a49581b7

+ 1 - 1
cde/programs/dtmail/dtmail/ComposeCmds.C

@@ -813,7 +813,7 @@ TemplateCmd::doit()
 	    char * helpId = DTMAILHELPERROR;
 	    int answer = dialog->post_and_return(helpId);
 	    SafeClose(fd);
-	    delete [] mbuf.buffer;
+	    delete (char*) mbuf.buffer;
 	    free(fullpath);
 	    return;
 	}

+ 1 - 1
cde/programs/dtmail/dtmail/RoamApp.C

@@ -598,7 +598,7 @@ tooltalk_msg_handler(
  
 	    if (SafeRead(fd, mbuf.buffer, 
 				(unsigned int) buf.st_size) != buf.st_size) {
-		delete [] mbuf.buffer;
+		delete (char*) mbuf.buffer;
 		close(fd);
 		return msg;
 	    }

+ 1 - 1
cde/programs/dtmail/dtmail/RoamCmds.C

@@ -3967,7 +3967,7 @@ VacationCmd::parseVacationMessage()
 	    helpId = DTMAILHELPCORRUPTVACATION;
 	    answer = dialog->post_and_return(helpId);
 	    SafeClose(fd);
-	    delete [] mbuf.buffer;
+	    delete (char*) mbuf.buffer;
 	    _subject = NULL;
 	    _body = NULL;
 

+ 1 - 1
cde/programs/dtmail/dtmail/RoamMenuWindow.C

@@ -1152,7 +1152,7 @@ RoamMenuWindow::msgListConvertCallback(
 		bufPtr += mbufList[ii].size;
 		bufPtr[0] = '\n';
 		bufPtr++;
-		delete mbufList[ii].buffer;
+		delete (char*)mbufList[ii].buffer;
 	    }
 
 	    XtFree((char *)mbufList);

+ 2 - 2
cde/programs/dtmail/include/utils/MemUtils.hh

@@ -92,9 +92,9 @@ grow_region(void * old_region, const int old_size, const int new_size)
 {
     void * new_region = new unsigned char[new_size];
     if (new_region) {
-	memcpy(new_region, old_region, old_size);
+        memcpy(new_region, old_region, old_size);
     }
-    delete old_region;
+    delete (unsigned char*) old_region;
     return(new_region);
 }