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

dtstyle: resolve 30 compiler warnings.

Browse source
This commit is contained in:
Peter Howkins 2015-01-05 16:07:49 +00:00
parent 2863b839e5
commit 466b8d0df5
15 changed files with 72 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cde/programs/dtstyle/Audio.c
View file

@ -42,6 +42,7 @@
/*+++++++++++++++++++++++++++++++++++++++*/ /*+++++++++++++++++++++++++++++++++++++++*/
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <errno.h>
#include <Xm/MwmUtil.h> #include <Xm/MwmUtil.h>
#include <Xm/XmP.h> #include <Xm/XmP.h>
@ -714,7 +715,9 @@ saveAudio(
sprintf(bufr, "%s*audioDlg.x: %d\n", bufr, x); sprintf(bufr, "%s*audioDlg.x: %d\n", bufr, x);
sprintf(bufr, "%s*audioDlg.y: %d\n", bufr, y); sprintf(bufr, "%s*audioDlg.y: %d\n", bufr, y);
write (fd, bufr, strlen(bufr)); if(-1 == write (fd, bufr, strlen(bufr))) {
perror(strerror(errno));
}
} }
} }

5
cde/programs/dtstyle/Backdrop.c
View file

@ -45,6 +45,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <errno.h>
#if defined(_AIX) || defined(__apollo) #if defined(_AIX) || defined(__apollo)
#include <sys/dir.h> #include <sys/dir.h>
@ -1235,7 +1236,9 @@ saveBackdrop(
backdrops.selected); backdrops.selected);
sprintf(bufr, "%s*backdropsDialog.selectedItem: %s\n", bufr, sprintf(bufr, "%s*backdropsDialog.selectedItem: %s\n", bufr,
backdrops.bitmapNames[backdrops.selected]); backdrops.bitmapNames[backdrops.selected]);
write (fd, bufr, strlen(bufr)); if(-1 == write (fd, bufr, strlen(bufr))) {
perror(strerror(errno));
}
} }
} }

9
cde/programs/dtstyle/ColorEdit.c
View file

@ -44,6 +44,7 @@
#include <X11/keysym.h> #include <X11/keysym.h>
#include <math.h> #include <math.h>
#include <errno.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <Xm/MwmUtil.h> #include <Xm/MwmUtil.h>
@ -1041,7 +1042,7 @@ changRGB_CB(
reason_code = ((XmAnyCallbackStruct *)call_data)->reason; reason_code = ((XmAnyCallbackStruct *)call_data)->reason;
if ( reason_code == XmCR_VALUE_CHANGED || reason_code == XmCR_DRAG ) if ( reason_code == XmCR_VALUE_CHANGED || reason_code == XmCR_DRAG )
{ {
color = (int) client_data; color = (int) (intptr_t) client_data;
value = ((XmScaleCallbackStruct *)call_data)->value; value = ((XmScaleCallbackStruct *)call_data)->value;
if (edit.current_scale == NONE) if (edit.current_scale == NONE)
@ -1093,7 +1094,7 @@ changHSV_CB(
reason_code = ((XmAnyCallbackStruct *)call_data)->reason; reason_code = ((XmAnyCallbackStruct *)call_data)->reason;
if ( reason_code == XmCR_VALUE_CHANGED || reason_code == XmCR_DRAG ) if ( reason_code == XmCR_VALUE_CHANGED || reason_code == XmCR_DRAG )
{ {
scale = (int) client_data; scale = (int) (intptr_t) client_data;
value = ((XmScaleCallbackStruct *)call_data)->value; value = ((XmScaleCallbackStruct *)call_data)->value;
if (edit.current_scale == NONE) if (edit.current_scale == NONE)
@ -1730,7 +1731,9 @@ saveColorEdit(
sprintf(bufr, "%s*colorEditDlg.x: %d\n", bufr, x); sprintf(bufr, "%s*colorEditDlg.x: %d\n", bufr, x);
sprintf(bufr, "%s*colorEditDlg.y: %d\n", bufr, y); sprintf(bufr, "%s*colorEditDlg.y: %d\n", bufr, y);
/*any other parameter you want to save goes here*/ /*any other parameter you want to save goes here*/
write (fd, bufr, strlen(bufr)); if(-1 == write (fd, bufr, strlen(bufr))) {
perror(strerror(errno));
}
} }
} }

6
cde/programs/dtstyle/ColorFile.c
View file

@ -43,6 +43,7 @@
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
@ -482,7 +483,10 @@ WriteOutPalette(
pCurrentPalette->color[i].bg.red, pCurrentPalette->color[i].bg.red,
pCurrentPalette->color[i].bg.green, pCurrentPalette->color[i].bg.green,
pCurrentPalette->color[i].bg.blue); pCurrentPalette->color[i].bg.blue);
write(fd, temp, strlen(temp)); if(-1 == write(fd, temp, strlen(temp))) {
perror(strerror(errno));
return(-1);
}
} }
XtFree(temp); XtFree(temp);
} }

20
cde/programs/dtstyle/ColorMain.c
View file

@ -48,6 +48,7 @@
#include <locale.h> #include <locale.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h>
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <Xm/MwmUtil.h> #include <Xm/MwmUtil.h>
@ -600,7 +601,7 @@ CreatePaletteButtons(
if (style.dynamicColor || style.visualClass==TrueColor if (style.dynamicColor || style.visualClass==TrueColor
|| style.visualClass==DirectColor) || style.visualClass==DirectColor)
XtAddCallback(colorButton[i], XmNactivateCallback, selectColorCB, XtAddCallback(colorButton[i], XmNactivateCallback, selectColorCB,
(XtPointer)i); (XtPointer) (intptr_t) i);
XmStringFree(string); XmStringFree(string);
} }
XtManageChildren(colorButton,pCurrentPalette->num_of_colors); XtManageChildren(colorButton,pCurrentPalette->num_of_colors);
@ -986,12 +987,13 @@ selectColorCB(
XtPointer client_data, XtPointer client_data,
XtPointer call_data ) XtPointer call_data )
{ {
int i,n; intptr_t i;
int n;
Arg args[4]; Arg args[4];
ColorSet *color_set; ColorSet *color_set;
XmPushButtonCallbackStruct *cb = (XmPushButtonCallbackStruct *)call_data; XmPushButtonCallbackStruct *cb = (XmPushButtonCallbackStruct *)call_data;
i = (int) client_data; i = (intptr_t) client_data;
/* if click_count == 1 .. first button press, set time out */ /* if click_count == 1 .. first button press, set time out */
if(cb->click_count == 1) if(cb->click_count == 1)
@ -1061,14 +1063,14 @@ timeoutCB(
XtIntervalId *id ) XtIntervalId *id )
{ {
register int n; register int n;
int i; intptr_t i;
Arg args[2]; Arg args[2];
Pixel bg_pixel; Pixel bg_pixel;
if (TypeOfMonitor == XmCO_BLACK_WHITE) if (TypeOfMonitor == XmCO_BLACK_WHITE)
return; return;
i = (int)client_data; i = (intptr_t) client_data;
if ((edit.DialogShell == NULL) || (!XtIsManaged(edit.DialogShell))) if ((edit.DialogShell == NULL) || (!XtIsManaged(edit.DialogShell)))
{ {
@ -1747,7 +1749,7 @@ colorUseCB(
XmToggleButtonCallbackStruct *cb = XmToggleButtonCallbackStruct *cb =
(XmToggleButtonCallbackStruct *)call_data; (XmToggleButtonCallbackStruct *)call_data;
colorDialog.currentColorUse = (int) client_data; colorDialog.currentColorUse = (int) (intptr_t) client_data;
switch (colorDialog.currentColorUse) switch (colorDialog.currentColorUse)
{ {
case XmCO_HIGH_COLOR: case XmCO_HIGH_COLOR:
@ -2327,7 +2329,7 @@ show_selection(
style.colorSrv = True; style.colorSrv = True;
if(value != NULL) if(value != NULL)
{ {
if((int)client_data == GET_TYPE_MONITOR) if((intptr_t) client_data == GET_TYPE_MONITOR)
{ {
sscanf ((char *)value, "%x_%x_%x_%x", (unsigned int *) &(TypeOfMonitor), sscanf ((char *)value, "%x_%x_%x_%x", (unsigned int *) &(TypeOfMonitor),
(unsigned int *) &(UsePixmaps), (unsigned int *) &(FgColor), (unsigned int *) &dynamic_color); (unsigned int *) &(UsePixmaps), (unsigned int *) &(FgColor), (unsigned int *) &dynamic_color);
@ -2456,7 +2458,9 @@ saveColor(
pCurrentPalette->name); pCurrentPalette->name);
sprintf(bufr, "%s*paletteDlg.selected_button: %d\n", bufr, sprintf(bufr, "%s*paletteDlg.selected_button: %d\n", bufr,
selected_button); selected_button);
write (fd, bufr, strlen(bufr)); if(-1 == write (fd, bufr, strlen(bufr))) {
perror(strerror(errno));
}
} }
} }

5
cde/programs/dtstyle/Dtwm.c
View file

@ -42,6 +42,7 @@
/*+++++++++++++++++++++++++++++++++++++++*/ /*+++++++++++++++++++++++++++++++++++++++*/
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <errno.h>
#include <Xm/MwmUtil.h> #include <Xm/MwmUtil.h>
#include <Xm/XmP.h> #include <Xm/XmP.h>
@ -981,7 +982,9 @@ saveDtwm(
sprintf(bufr, "%s*dtwmDlg.y: %d\n", bufr, y); sprintf(bufr, "%s*dtwmDlg.y: %d\n", bufr, y);
sprintf(bufr, "%s*dtwmDlg.width: %d\n", bufr, width); sprintf(bufr, "%s*dtwmDlg.width: %d\n", bufr, width);
sprintf(bufr, "%s*dtwmDlg.height: %d\n", bufr, height); sprintf(bufr, "%s*dtwmDlg.height: %d\n", bufr, height);
write (fd, bufr, strlen(bufr)); if(-1 == write (fd, bufr, strlen(bufr))) {
perror(strerror(errno));
}
} }
} }

5
cde/programs/dtstyle/Font.c
View file

@ -66,6 +66,7 @@
#include <Dt/HourGlass.h> #include <Dt/HourGlass.h>
#include <string.h> #include <string.h>
#include <errno.h>
#include "Help.h" #include "Help.h"
#include "Main.h" #include "Main.h"
#include "SaveRestore.h" #include "SaveRestore.h"
@ -753,7 +754,9 @@ saveFonts(
sprintf(bufr, "%s*Fonts.x: %d\n", bufr, x); sprintf(bufr, "%s*Fonts.x: %d\n", bufr, x);
sprintf(bufr, "%s*Fonts.y: %d\n", bufr, y); sprintf(bufr, "%s*Fonts.y: %d\n", bufr, y);
write (fd, bufr, strlen(bufr)); if(-1 == write (fd, bufr, strlen(bufr))) {
perror(strerror(errno));
}
} }
} }

4
cde/programs/dtstyle/HelpCB.c
View file

@ -54,9 +54,9 @@ HelpRequestCB(
caddr_t call_data ) caddr_t call_data )
{ {
char *helpVolume, *locationId; char *helpVolume, *locationId;
int topic; intptr_t topic;
topic = (int) client_data; topic = (intptr_t) client_data;
helpVolume = HELP_VOLUME; helpVolume = HELP_VOLUME;
switch (topic) switch (topic)

9
cde/programs/dtstyle/I18nMain.c
View file

@ -46,6 +46,7 @@
/*+++++++++++++++++++++++++++++++++++++++*/ /*+++++++++++++++++++++++++++++++++++++++*/
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <errno.h>
#include <Xm/MwmUtil.h> #include <Xm/MwmUtil.h>
#include <Xm/XmP.h> #include <Xm/XmP.h>
@ -509,7 +510,7 @@ BuildI18nDlg(
n = 0; n = 0;
XtSetArg(args[n], XmNcomboBoxType, XmDROP_DOWN_COMBO_BOX); n++; XtSetArg(args[n], XmNcomboBoxType, XmDROP_DOWN_COMBO_BOX); n++;
i18n.serverHostCB = i18n.serverHostCB =
(Widget) XmCreateComboBox(inputMethodForm, "serverHostCB", args, n); (Widget) (intptr_t) XmCreateComboBox(inputMethodForm, "serverHostCB", args, n);
XtAddCallback(XtNameToWidget(i18n.serverHostCB, "Text"), XtAddCallback(XtNameToWidget(i18n.serverHostCB, "Text"),
XmNactivateCallback, ServerHostCB, NULL); XmNactivateCallback, ServerHostCB, NULL);
@ -560,7 +561,7 @@ BuildI18nDlg(
n = 0; n = 0;
XtSetArg(args[n], XmNselectionPolicy, XmBROWSE_SELECT); n++; XtSetArg(args[n], XmNselectionPolicy, XmBROWSE_SELECT); n++;
i18n.preeditTypeList = i18n.preeditTypeList =
(Widget) XmCreateList(preeditTypeForm, "preeditTypeList", args, n); (Widget) (intptr_t) XmCreateList(preeditTypeForm, "preeditTypeList", args, n);
n = 0; n = 0;
string = CMPSTR((char *)GETMESSAGE(19, 10, "Move Up")); string = CMPSTR((char *)GETMESSAGE(19, 10, "Move Up"));
@ -1205,7 +1206,9 @@ saveI18n(
sprintf(bufr, "%s*i18nDlg.y: %d\n", bufr, y); sprintf(bufr, "%s*i18nDlg.y: %d\n", bufr, y);
sprintf(bufr, "%s*i18nDlg.width: %d\n", bufr, width); sprintf(bufr, "%s*i18nDlg.width: %d\n", bufr, width);
sprintf(bufr, "%s*i18nDlg.height: %d\n", bufr, height); sprintf(bufr, "%s*i18nDlg.height: %d\n", bufr, height);
write (fd, bufr, strlen(bufr)); if(-1 == write (fd, bufr, strlen(bufr))) {
perror(strerror(errno));
}
} }
} }

5
cde/programs/dtstyle/Keyboard.c
View file

@ -42,6 +42,7 @@
/* include files */ /* include files */
/*+++++++++++++++++++++++++++++++++++++++*/ /*+++++++++++++++++++++++++++++++++++++++*/
#include <errno.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <Xm/MwmUtil.h> #include <Xm/MwmUtil.h>
@ -634,7 +635,9 @@ saveKeybd(
sprintf(bufr, "%s*keyboardDlg.x: %d\n", bufr, x); sprintf(bufr, "%s*keyboardDlg.x: %d\n", bufr, x);
sprintf(bufr, "%s*keyboardDlg.y: %d\n", bufr, y); sprintf(bufr, "%s*keyboardDlg.y: %d\n", bufr, y);
write (fd, bufr, strlen(bufr)); if(-1 == write (fd, bufr, strlen(bufr))) {
perror(strerror(errno));
}
} }
} }

7
cde/programs/dtstyle/MainWin.c
View file

@ -50,6 +50,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <Xm/MwmUtil.h> #include <Xm/MwmUtil.h>
#include <signal.h> #include <signal.h>
#include <errno.h>
#include <Xm/Xm.h> #include <Xm/Xm.h>
#include <Xm/XmP.h> #include <Xm/XmP.h>
@ -553,7 +554,7 @@ ProcessComponentList(
XtManageChild (componentWidget); XtManageChild (componentWidget);
XtAddCallback(componentWidget, XmNcallback, activateCB, string); XtAddCallback(componentWidget, XmNcallback, activateCB, string);
XtAddCallback(componentWidget, XmNhelpCallback, XtAddCallback(componentWidget, XmNhelpCallback,
(XtCallbackProc)HelpRequestCB, (XtPointer)helpTag); (XtCallbackProc)HelpRequestCB, (XtPointer) (intptr_t) helpTag);
XmStringFree(cmp_string); XmStringFree(cmp_string);
XtFree(dtIcon); XtFree(dtIcon);
@ -776,7 +777,9 @@ saveMain(
sprintf(bufr, "%s*mainWindow.x: %d\n", bufr, x); sprintf(bufr, "%s*mainWindow.x: %d\n", bufr, x);
sprintf(bufr, "%s*mainWindow.y: %d\n", bufr, y); sprintf(bufr, "%s*mainWindow.y: %d\n", bufr, y);
write (fd, bufr, strlen(bufr)); if(-1 == write (fd, bufr, strlen(bufr))) {
perror(strerror(errno));
}
} }
} }

11
cde/programs/dtstyle/Mouse.c
View file

@ -39,6 +39,7 @@
/*$XConsortium: Mouse.c /main/5 1996/07/19 13:45:42 pascale $*/ /*$XConsortium: Mouse.c /main/5 1996/07/19 13:45:42 pascale $*/
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <errno.h>
#include <Xm/Xm.h> #include <Xm/Xm.h>
#include <Xm/Form.h> #include <Xm/Form.h>
@ -1188,7 +1189,7 @@ midwarnToggleCB(
XtUnmanageChild (XmMessageBoxGetChild(midwarnDialog, XmDIALOG_HELP_BUTTON)); XtUnmanageChild (XmMessageBoxGetChild(midwarnDialog, XmDIALOG_HELP_BUTTON));
if ((Boolean)client_data == TRANSFER) if ((intptr_t)client_data == TRANSFER)
{ {
warnstring = CMPSTR(MID_WARN_MSG_T); warnstring = CMPSTR(MID_WARN_MSG_T);
XtVaSetValues(midwarnDialog, XmNmessageString, warnstring, NULL); n++; XtVaSetValues(midwarnDialog, XmNmessageString, warnstring, NULL); n++;
@ -1286,7 +1287,7 @@ reverseToggleCB(
Boolean set; Boolean set;
Boolean toggle; Boolean toggle;
toggle = (Boolean) client_data; toggle = (Boolean) (intptr_t) client_data;
if(mouse.type == POINTER3B) if(mouse.type == POINTER3B)
{ {
@ -1370,7 +1371,7 @@ midreverseToggleCB(
Boolean set; Boolean set;
Boolean toggle; Boolean toggle;
toggle = (Boolean) client_data; toggle = (Boolean) (intptr_t) client_data;
if (toggle == ADJUST) if (toggle == ADJUST)
{ {
@ -1771,7 +1772,9 @@ saveMouse(
sprintf(bufr, "%s*Mouse.x: %d\n", bufr, x); sprintf(bufr, "%s*Mouse.x: %d\n", bufr, x);
sprintf(bufr, "%s*Mouse.y: %d\n", bufr, y); sprintf(bufr, "%s*Mouse.y: %d\n", bufr, y);
write (fd, bufr, strlen(bufr)); if(-1 == write (fd, bufr, strlen(bufr))) {
perror(strerror(errno));
}
} }
} }

2
cde/programs/dtstyle/Protocol.c
View file

@ -253,7 +253,7 @@ WorkspaceStartupTimer(
XtIntervalId *id) XtIntervalId *id)
{ {
Atom aWS; Atom aWS;
int count = (int) client_data; intptr_t count = (intptr_t) client_data;
if (DtWsmGetCurrentWorkspace (style.display, style.root, &aWS) if (DtWsmGetCurrentWorkspace (style.display, style.root, &aWS)
== Success) == Success)

5
cde/programs/dtstyle/Screen.c
View file

@ -57,6 +57,7 @@
#include <stdio.h> #include <stdio.h>
#include <signal.h> #include <signal.h>
#include <errno.h>
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
@ -2912,7 +2913,9 @@ saveScreen(
sprintf(bufr, "%s*Screen.x: %d\n", bufr, x); sprintf(bufr, "%s*Screen.x: %d\n", bufr, x);
sprintf(bufr, "%s*Screen.y: %d\n", bufr, y); sprintf(bufr, "%s*Screen.y: %d\n", bufr, y);
write (fd, bufr, strlen(bufr)); if(-1 == write (fd, bufr, strlen(bufr))) {
perror(strerror(errno));
}
} }
} }

5
cde/programs/dtstyle/Startup.c
View file

@ -43,6 +43,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <Xm/MwmUtil.h> #include <Xm/MwmUtil.h>
#include <errno.h>
#include <Xm/Xm.h> #include <Xm/Xm.h>
#include <Xm/XmP.h> #include <Xm/XmP.h>
@ -726,7 +727,9 @@ saveStartup(
sprintf(bufr, "%s*startupDlg.x: %d\n", bufr, x); sprintf(bufr, "%s*startupDlg.x: %d\n", bufr, x);
sprintf(bufr, "%s*startupDlg.y: %d\n", bufr, y); sprintf(bufr, "%s*startupDlg.y: %d\n", bufr, y);
write (fd, bufr, strlen(bufr)); if(-1 == write (fd, bufr, strlen(bufr))) {
perror(strerror(errno));
}
} }
} }