debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtpad: Use XtArgVal for int conversion

Browse Source 
Avoid overwrite of local variables when using
short (int, etc.) types with XtVaGetValues().

Cast XtPointer using (XtArgVal) without
the need to use C99 <stdint.h> and friends.
This commit is contained in:
Marcin Cieslak
2012-09-24 03:15:20 +02:00
committed by Jon Trulson
parent d089ff7599
commit e077181a46
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cde/programs/dtpad/printOutput.c
View File

@@ -569,6 +569,7 @@ PrintOutputGetLinesPerPage(PrintOutput *pOutput)
int
PrintOutputGetNumLines(PrintOutput *pOutput)
{
XtArgVal p;
int total = 0;
int saveTop;
@@ -581,7 +582,8 @@ PrintOutputGetNumLines(PrintOutput *pOutput)
DtEditorGoToLine(pOutput->editor, saveTop);
pOutput->currentLine = saveTop;
#else
XtVaGetValues(pOutput->editor, XmNtotalLines, &total, NULL);
XtVaGetValues(pOutput->editor, XmNtotalLines, &p, NULL);
total = (int)p;
#endif
return(total);
}
@@ -698,7 +700,7 @@ PrintOutputLoadFile( PrintOutput *pOutput, char *file)
static int
_poDoGetLinesPerPage(PrintOutput *pOutput)
{
Dimension lpp;
XtArgVal lpp;
XtVaGetValues(pOutput->editor, XmNrows, &lpp, NULL);
return ((int) lpp);
@@ -714,23 +716,29 @@ _poSetInnerPageDimensions(
Dimension left
)
{
XtArgVal outer_height0, outer_width0, footer_height0, header_height0;
Dimension inner_height, inner_width, inner_x, inner_y,
outer_height, outer_width,
editor_height, footer_height, header_height;
XtVaGetValues(pOutput->page,
XmNheight, &outer_height,
XmNwidth, &outer_width,
XmNheight, &outer_height0,
XmNwidth, &outer_width0,
NULL);
XtVaGetValues(pOutput->headerLeft,
XmNheight, &header_height,
XmNheight, &header_height0,
NULL);
XtVaGetValues(pOutput->footerLeft,
XmNheight, &footer_height,
XmNheight, &footer_height0,
NULL);
outer_height = (Dimension)outer_height0;
outer_width = (Dimension)outer_width0;
header_height = (Dimension)header_height0;
footer_height = (Dimension)footer_height0;
inner_x = left;
inner_y = top;
inner_height = (outer_height > (Dimension) (top + bottom)) ?