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

dtterm: coverity fixes

Browse source
This commit is contained in:
Peter Howkins 2018-04-12 21:29:49 +01:00
parent ae6b787c66
commit 4e9dc6c50b
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cde/programs/dtterm/DtTermMain.c
View file

@ -142,7 +142,7 @@ static void SetWorkSpaceHints(
Widget shell, Widget shell,
char *workspaces ); char *workspaces );
static XtEventHandler TestProbeHandler( static void TestProbeHandler(
Widget w, Widget w,
XtPointer client_data, XtPointer client_data,
XEvent *event, XEvent *event,
@ -420,7 +420,7 @@ DecrementInstanceCountAndExit(Widget w, XtPointer client_data,
InstanceCount--; InstanceCount--;
if (InstanceCount > 0) if (InstanceCount > 0)
{ {
new_instance_list = (DtTermViewWidget *)XtMalloc(sizeof(DtTermViewWidget *)*InstanceCount); new_instance_list = (DtTermViewWidget *)XtMalloc(sizeof(DtTermViewWidget) * InstanceCount);
for (j = 0,i = 0; i < (InstanceCount+1); i++) for (j = 0,i = 0; i < (InstanceCount+1); i++)
if (instance_list[i] != (DtTermViewWidget )w) if (instance_list[i] != (DtTermViewWidget )w)
{ {
@ -505,7 +505,7 @@ static void RegisterTestProbe(
* TestProbeHandler - handle the client message for test probes * * TestProbeHandler - handle the client message for test probes *
* * * *
***************************************************************************/ ***************************************************************************/
static XtEventHandler TestProbeHandler( static void TestProbeHandler(
Widget w, Widget w,
XtPointer client_data, XtPointer client_data,
XEvent *event, XEvent *event,
@ -535,8 +535,8 @@ static XtEventHandler TestProbeHandler(
Arg al[5]; Arg al[5];
*ctd = True; *ctd = True;
if (cm->send_event == False) return 0; if (cm->send_event == False) return;
if (cm->message_type != xa_DTTERM_REMOTE_PROBE_REQUEST) return 0; if (cm->message_type != xa_DTTERM_REMOTE_PROBE_REQUEST) return;
reply = (unsigned char*) malloc(sizeof(unsigned char) * 1024); reply = (unsigned char*) malloc(sizeof(unsigned char) * 1024);
@ -758,7 +758,7 @@ CloneCallback(Widget wid, XtPointer client_data, XtPointer call_data)
(void) XtAddCallback(termWidget, DtNnewCallback, (void) XtAddCallback(termWidget, DtNnewCallback,
CloneCallback, (XtPointer) 0); CloneCallback, (XtPointer) 0);
instance_list = (DtTermViewWidget *)XtRealloc((char *)instance_list, instance_list = (DtTermViewWidget *)XtRealloc((char *)instance_list,
(sizeof(DtTermViewWidget *)*InstanceCount)); (sizeof(DtTermViewWidget) * InstanceCount));
instance_list[InstanceCount - 1] = (DtTermViewWidget )termWidget; instance_list[InstanceCount - 1] = (DtTermViewWidget )termWidget;
(void) XtRealizeWidget(shellWidget); (void) XtRealizeWidget(shellWidget);
@ -825,11 +825,15 @@ CreateInstance
DecrementInstanceCountAndExit, (XtPointer) topLevelWidget); DecrementInstanceCountAndExit, (XtPointer) topLevelWidget);
(void) _DtTermPrimAddDeleteWindowCallback(topLevelWidget, DestroyDtTerm, (void) _DtTermPrimAddDeleteWindowCallback(topLevelWidget, DestroyDtTerm,
(XtPointer) topLevelWidget); (XtPointer) topLevelWidget);
instance_list = (DtTermViewWidget * )XtRealloc((char *)instance_list,(sizeof(DtTermViewWidget *)*InstanceCount)); instance_list = (DtTermViewWidget * ) XtRealloc((char *)instance_list, (sizeof(DtTermViewWidget) * InstanceCount));
instance_list[InstanceCount - 1] = (DtTermViewWidget )termViewWidget; instance_list[InstanceCount - 1] = (DtTermViewWidget )termViewWidget;
if (enableCloneCallback) if (enableCloneCallback)
(void) XtAddCallback(termViewWidget, DtNnewCallback, (void) XtAddCallback(termViewWidget, DtNnewCallback,
CloneCallback, (XtPointer) 0); CloneCallback, (XtPointer) 0);
#ifdef SUN_TERMINAL_SERVER
return(True);
#endif
} }
void void
@ -1061,7 +1065,7 @@ FixOSFBindings
/* changed from XtFree to free as it was allocated with malloc to avoid FMM */ /* changed from XtFree to free as it was allocated with malloc to avoid FMM */
if (freeOrigBindings) free(origDisplayBindings); if (freeOrigBindings) free(origDisplayBindings);
if (ignoredKeysymList) XtFree((char *)ignoredKeysymList); XtFree((char *)ignoredKeysymList);
/* and finally, reparse the string... */ /* and finally, reparse the string... */
_XmVirtKeysInitialize(w); _XmVirtKeysInitialize(w);
@ -1376,8 +1380,9 @@ main(int argc, char **argv)
/* realize the interface... */ /* realize the interface... */
i = 0; i = 0;
(void) XtSetArg(arglist[i], XmNtitle, attrs.title); i++; (void) XtSetArg(arglist[i], XmNtitle, attrs.title); i++;
if ((!attrs.icon_name) && (!attrs.dtterm_name)) if ((!attrs.icon_name) && (!attrs.dtterm_name)) {
(void) XtSetArg(arglist[i], XmNiconName, attrs.title); i++; (void) XtSetArg(arglist[i], XmNiconName, attrs.title); i++;
}
(void) XtSetArg(arglist[i], XmNmappedWhenManaged, False); i++; (void) XtSetArg(arglist[i], XmNmappedWhenManaged, False); i++;
(void) XtSetArg(arglist[i], XmNgeometry, NULL); i++; (void) XtSetArg(arglist[i], XmNgeometry, NULL); i++;
(void) XtSetValues(topShell, arglist, i); (void) XtSetValues(topShell, arglist, i);

8
cde/programs/dtterm/sunDtTermServer.c
View file

@ -28,6 +28,8 @@
* (c) Copyright 1993, 1994 Novell, Inc. * * (c) Copyright 1993, 1994 Novell, Inc. *
*/ */
#include <stdint.h>
#include "TermHeader.h" #include "TermHeader.h"
#include "TermPrimDebug.h" #include "TermPrimDebug.h"
#include "TermView.h" #include "TermView.h"
@ -188,7 +190,7 @@ FinishToolTalkInit(Widget topLevel)
displayString = DisplayString(XtDisplay(refWidget)); displayString = DisplayString(XtDisplay(refWidget));
} }
return(1);
} }
Tt_callback_action Tt_callback_action
@ -233,7 +235,7 @@ dttermNewHandler(
char *msgFile; char *msgFile;
char numArgs; char numArgs;
int i, j, k; int i, j, k;
char *displayEnv, *newDisplayString; char *displayEnv, *newDisplayString = NULL;
msgFile = tt_message_file(msg); msgFile = tt_message_file(msg);
if (tt_is_err(tt_ptr_error(msgFile))) msgFile = 0; if (tt_is_err(tt_ptr_error(msgFile))) msgFile = 0;
@ -342,7 +344,7 @@ TimeOut(
static void static void
ExitCB (Widget dialog, XtPointer client_data, XtPointer call_data) ExitCB (Widget dialog, XtPointer client_data, XtPointer call_data)
{ {
exit((int) client_data); exit((int) (intptr_t) client_data);
} }
void void