external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
https://sourceforge.net/p/cdesktopenv/code/merge-requests/18/
This commit is contained in:
Jon Trulson 2019-10-13 17:06:14 +00:00
commit 08a49581b7
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cde/programs/dtmail/dtmail/ComposeCmds.C
View file

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

2
cde/programs/dtmail/dtmail/RoamApp.C
View file

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

2
cde/programs/dtmail/dtmail/RoamCmds.C
View file

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

2
cde/programs/dtmail/dtmail/RoamMenuWindow.C
View file

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

4
cde/programs/dtmail/include/utils/MemUtils.hh
View file

@ -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]; void * new_region = new unsigned char[new_size];
if (new_region) { 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); return(new_region);
} }