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

dtksh: fix 32b/64b issues with XmTextGetString and XmTextFieldGetString

Browse source 
Some of these functions were returning pointers cast as integers,
which of course is bad on a 64b LP64 systems.

This code should probably just be refactored at some point.  There may
be other hidden issues, and all the casting just sucks.
This commit is contained in:
Jon Trulson 2020-03-08 15:05:48 -06:00
parent 83ef13af18
commit 6f1a110e1d
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cde/programs/dtksh/xmcmds.c
View file

@ -171,7 +171,7 @@ static int Text_Widget(
int argc, int argc,
char *argv[]) ; char *argv[]) ;
static int Text_VarAndWidget( static int Text_VarAndWidget(
int (*func)(Widget w), long (*func)(Widget w),
Boolean varIsString, Boolean varIsString,
int argc, int argc,
char *argv[]) ; char *argv[]) ;
@ -1301,7 +1301,7 @@ do_DtHelpReturnSelectedWidgetId(
return(1); return(1);
} }
res = DtHelpReturnSelectedWidgetId(w->w, NULL, &retWidget); res = DtHelpReturnSelectedWidgetId(w->w, 0, &retWidget);
XSync(XtDisplay(w->w), False); XSync(XtDisplay(w->w), False);
f.addr = (caddr_t)&res; f.addr = (caddr_t)&res;
@ -3959,7 +3959,7 @@ do_XmTextRemove(
static int static int
Text_VarAndWidget( Text_VarAndWidget(
int (*func)(Widget w), long (*func)(Widget w),
Boolean varIsString, Boolean varIsString,
int argc, int argc,
char *argv[] ) char *argv[] )
@ -4008,7 +4008,7 @@ do_XmTextGetTopCharacter(
int argc, int argc,
char *argv[] ) char *argv[] )
{ {
return (Text_VarAndWidget((int (*)())XmTextGetTopCharacter, False, argc, return (Text_VarAndWidget((long (*)())XmTextGetTopCharacter, False, argc,
argv)); argv));
} }
@ -4018,7 +4018,7 @@ do_XmTextGetBaseline(
int argc, int argc,
char *argv[] ) char *argv[] )
{ {
return (Text_VarAndWidget(XmTextGetBaseline, False, argc, argv)); return (Text_VarAndWidget((long (*)())XmTextGetBaseline, False, argc, argv));
} }
@ -4027,7 +4027,7 @@ do_XmTextGetInsertionPosition(
int argc, int argc,
char *argv[] ) char *argv[] )
{ {
return (Text_VarAndWidget((int (*)())XmTextGetInsertionPosition, False, return (Text_VarAndWidget((long (*)())XmTextGetInsertionPosition, False,
argc, argv)); argc, argv));
} }
@ -4037,7 +4037,7 @@ do_XmTextGetLastPosition(
int argc, int argc,
char *argv[] ) char *argv[] )
{ {
return (Text_VarAndWidget((int (*)())XmTextGetLastPosition, False, argc, return (Text_VarAndWidget((long (*)())XmTextGetLastPosition, False, argc,
argv)); argv));
} }
@ -4047,7 +4047,7 @@ do_XmTextGetMaxLength(
int argc, int argc,
char *argv[] ) char *argv[] )
{ {
return (Text_VarAndWidget(XmTextGetMaxLength, False, argc, argv)); return (Text_VarAndWidget((long (*)())XmTextGetMaxLength, False, argc, argv));
} }
@ -4056,7 +4056,7 @@ do_XmTextGetSelection(
int argc, int argc,
char *argv[] ) char *argv[] )
{ {
return (Text_VarAndWidget((int (*)())XmTextGetSelection, True, argc, argv)); return (Text_VarAndWidget((long (*)())XmTextGetSelection, True, argc, argv));
} }
@ -4065,7 +4065,7 @@ do_XmTextGetString(
int argc, int argc,
char *argv[] ) char *argv[] )
{ {
return (Text_VarAndWidget((int (*)())XmTextGetString, True, argc, argv)); return (Text_VarAndWidget((long (*)())XmTextGetString, True, argc, argv));
} }