From: Peter Howkins Date: Tue, 3 Sep 2013 14:41:58 +0000 (+0100) Subject: dtstyle: Resolve 70 compiler warnings X-Git-Tag: 2.2.1~24^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c742edcb2ff2c8d33d985eee7193ac232b671272;p=oweals%2Fcde.git dtstyle: Resolve 70 compiler warnings --- diff --git a/cde/programs/dtstyle/Audio.c b/cde/programs/dtstyle/Audio.c index 427449d2..4ae74812 100644 --- a/cde/programs/dtstyle/Audio.c +++ b/cde/programs/dtstyle/Audio.c @@ -151,9 +151,9 @@ build_audioDlg( audio.values.bell_duration = 1; /* Set up DialogBoxDialog button labels */ - button_string[0] = CMPSTR(_DtOkString); - button_string[1] = CMPSTR(_DtCancelString); - button_string[2] = CMPSTR(_DtHelpString); + button_string[0] = CMPSTR((String) _DtOkString); + button_string[1] = CMPSTR((String) _DtCancelString); + button_string[2] = CMPSTR((String) _DtHelpString); /* Create toplevel DialogBox */ /* saveRestore diff --git a/cde/programs/dtstyle/Backdrop.c b/cde/programs/dtstyle/Backdrop.c index 0760cfb8..7beb4687 100644 --- a/cde/programs/dtstyle/Backdrop.c +++ b/cde/programs/dtstyle/Backdrop.c @@ -425,10 +425,10 @@ CreateBackdropDialog( XtFree(bd_desc); /* Set up DialogBox button labels. */ - strings[0] = XmStringCreateLocalized (_DtOkString); - strings[1] = XmStringCreateLocalized (_DtApplyString); - strings[2] = XmStringCreateLocalized (_DtCloseString); - strings[3] = XmStringCreateLocalized (_DtHelpString); + strings[0] = XmStringCreateLocalized ((String) _DtOkString); + strings[1] = XmStringCreateLocalized ((String) _DtApplyString); + strings[2] = XmStringCreateLocalized ((String) _DtCloseString); + strings[3] = XmStringCreateLocalized ((String) _DtHelpString); /* saveRestore * Note that save.poscnt has been initialized elsewhere. diff --git a/cde/programs/dtstyle/ColorEdit.c b/cde/programs/dtstyle/ColorEdit.c index 9e067633..eeb32b38 100644 --- a/cde/programs/dtstyle/ColorEdit.c +++ b/cde/programs/dtstyle/ColorEdit.c @@ -225,9 +225,9 @@ CreateColorEditor( edit.current_scale = NONE; /* Set up DialogBox button labels. */ - button_string[0] = CMPSTR(_DtOkString); - button_string[1] = CMPSTR(_DtCancelString); - button_string[2] = CMPSTR(_DtHelpString); + button_string[0] = CMPSTR((String) _DtOkString); + button_string[1] = CMPSTR((String) _DtCancelString); + button_string[2] = CMPSTR((String) _DtHelpString); /* Note that save.poscnt has been initialized elsewhere. * save.posArgs may contain information from restoreColorEdit(). */ diff --git a/cde/programs/dtstyle/ColorMain.c b/cde/programs/dtstyle/ColorMain.c index 40d04c47..80d95131 100644 --- a/cde/programs/dtstyle/ColorMain.c +++ b/cde/programs/dtstyle/ColorMain.c @@ -1065,9 +1065,9 @@ addPaletteCB( { n = 0; - XtSetArg(args[n], XmNokLabelString, CMPSTR(_DtOkString)); n++; - XtSetArg(args[n], XmNcancelLabelString, CMPSTR(_DtCancelString)); n++; - XtSetArg(args[n], XmNhelpLabelString, CMPSTR(_DtHelpString)); n++; + XtSetArg(args[n], XmNokLabelString, CMPSTR((String) _DtOkString)); n++; + XtSetArg(args[n], XmNcancelLabelString, CMPSTR((String) _DtCancelString)); n++; + XtSetArg(args[n], XmNhelpLabelString, CMPSTR((String) _DtHelpString)); n++; string = CMPSTR(((char *)GETMESSAGE(14, 10, "New palette name:"))); XtSetArg(args[n], XmNselectionLabelString, string); n++; string1 = CMPSTR(""); @@ -1476,9 +1476,9 @@ deletePaletteCB( if (deleteDialog == NULL) { n=0; - XtSetArg(args[n], XmNokLabelString, CMPSTR(_DtOkString)); n++; - XtSetArg(args[n], XmNcancelLabelString, CMPSTR(_DtCancelString)); n++; - XtSetArg(args[n], XmNhelpLabelString, CMPSTR(_DtHelpString)); n++; + XtSetArg(args[n], XmNokLabelString, CMPSTR((String) _DtOkString)); n++; + XtSetArg(args[n], XmNcancelLabelString, CMPSTR((String) _DtCancelString)); n++; + XtSetArg(args[n], XmNhelpLabelString, CMPSTR((String) _DtHelpString)); n++; XtSetArg(args[n], XmNdialogType, XmDIALOG_INFORMATION); n++; XtSetArg(args[n], XmNborderWidth, 3); n++; XtSetArg(args[n], XmNdefaultPosition, False); n++; @@ -1567,9 +1567,9 @@ resourcesCB( n = 0; /* Set up DialogBox button labels. */ - button_string[0] = CMPSTR(_DtOkString); - button_string[1] = CMPSTR(_DtCancelString); - button_string[2] = CMPSTR(_DtHelpString); + button_string[0] = CMPSTR((String) _DtOkString); + button_string[1] = CMPSTR((String) _DtCancelString); + button_string[2] = CMPSTR((String) _DtHelpString); XtSetArg (args[n], XmNchildType, XmWORK_AREA); n++; XtSetArg (args[n], XmNbuttonCount, NUM_LABELS); n++; @@ -2049,7 +2049,7 @@ SaveOrgPalette( void ) int i; palette *tmp_palette, *tmp2_palette; - if(save.restoreFlag && defaultName_restore[0] != NULL) { + if(save.restoreFlag && defaultName_restore[0] != 0) { tmp_palette = pHeadPalette; while(tmp_palette->next != NULL ) if(strcmp(tmp_palette->name, defaultName)) @@ -2077,7 +2077,7 @@ SaveOrgPalette( void ) OrgPalette.active = pCurrentPalette->active; OrgPalette.inactive = pCurrentPalette->inactive; - if(save.restoreFlag && defaultName_restore[0] != NULL) + if(save.restoreFlag && defaultName_restore[0] != 0) OrgPalette.color[i].bg.pixel = tmp2_palette->color[i].bg.pixel; else OrgPalette.color[i].bg.pixel = pCurrentPalette->color[i].bg.pixel; @@ -2085,7 +2085,7 @@ SaveOrgPalette( void ) OrgPalette.color[i].bg.green = pCurrentPalette->color[i].bg.green; OrgPalette.color[i].bg.blue = pCurrentPalette->color[i].bg.blue; - if(save.restoreFlag && defaultName_restore[0] != NULL) + if(save.restoreFlag && defaultName_restore[0] != 0) OrgPalette.color[i].fg.pixel = tmp2_palette->color[i].fg.pixel; else OrgPalette.color[i].fg.pixel = pCurrentPalette->color[i].fg.pixel; @@ -2093,7 +2093,7 @@ SaveOrgPalette( void ) OrgPalette.color[i].fg.green = pCurrentPalette->color[i].fg.green; OrgPalette.color[i].fg.blue = pCurrentPalette->color[i].fg.blue; - if(save.restoreFlag && defaultName_restore[0] != NULL) + if(save.restoreFlag && defaultName_restore[0] != 0) OrgPalette.color[i].ts.pixel = tmp2_palette->color[i].ts.pixel; else OrgPalette.color[i].ts.pixel = pCurrentPalette->color[i].ts.pixel; @@ -2101,7 +2101,7 @@ SaveOrgPalette( void ) OrgPalette.color[i].ts.green = pCurrentPalette->color[i].ts.green; OrgPalette.color[i].ts.blue = pCurrentPalette->color[i].ts.blue; - if(save.restoreFlag && defaultName_restore[0] != NULL) + if(save.restoreFlag && defaultName_restore[0] != 0) OrgPalette.color[i].bs.pixel = tmp2_palette->color[i].bs.pixel; else OrgPalette.color[i].bs.pixel = pCurrentPalette->color[i].bs.pixel; @@ -2109,7 +2109,7 @@ SaveOrgPalette( void ) OrgPalette.color[i].bs.green = pCurrentPalette->color[i].bs.green; OrgPalette.color[i].bs.blue = pCurrentPalette->color[i].bs.blue; - if(save.restoreFlag && defaultName_restore[0] != NULL) + if(save.restoreFlag && defaultName_restore[0] != 0) OrgPalette.color[i].sc.pixel = tmp2_palette->color[i].sc.pixel; else OrgPalette.color[i].sc.pixel = pCurrentPalette->color[i].sc.pixel; @@ -2118,7 +2118,7 @@ SaveOrgPalette( void ) OrgPalette.color[i].sc.blue = pCurrentPalette->color[i].sc.blue; } - if(save.restoreFlag && defaultName_restore[0] != NULL) + if(save.restoreFlag && defaultName_restore[0] != 0) if(tmp_palette != NULL) pCurrentPalette = tmp2_palette; @@ -2286,8 +2286,8 @@ show_selection( { if((int)client_data == GET_TYPE_MONITOR) { - sscanf ((char *)value, "%x_%x_%x_%x",&(TypeOfMonitor), - &(UsePixmaps), &(FgColor),&dynamic_color); + sscanf ((char *)value, "%x_%x_%x_%x", (unsigned int *) &(TypeOfMonitor), + (unsigned int *) &(UsePixmaps), (unsigned int *) &(FgColor), (unsigned int *) &dynamic_color); if(dynamic_color == FALSE) style.dynamicColor = False; else @@ -2440,9 +2440,9 @@ SameName( tmpStr = (char *)XtMalloc(strlen(STR1) + strlen(name) + 1); sprintf(tmpStr, STR1, name); XtSetArg(args[n], XmNmessageString, CMPSTR(tmpStr)); n++; - XtSetArg(args[n], XmNokLabelString, CMPSTR(_DtOkString)); n++; - XtSetArg(args[n], XmNcancelLabelString, CMPSTR(_DtCancelString)); n++; - XtSetArg(args[n], XmNhelpLabelString, CMPSTR(_DtHelpString)); n++; + XtSetArg(args[n], XmNokLabelString, CMPSTR((String) _DtOkString)); n++; + XtSetArg(args[n], XmNcancelLabelString, CMPSTR((String) _DtCancelString)); n++; + XtSetArg(args[n], XmNhelpLabelString, CMPSTR((String) _DtHelpString)); n++; XtSetArg(args[n], XmNmwmFunctions, DIALOG_MWM_FUNC ); n++; XtSetArg(args[n], XmNdialogTitle, CMPSTR(((char *)GETMESSAGE(14, 21, "Warning")))); n++; colorDialog.dlg = XmCreateWarningDialog(style.colorDialog, "QNotice", args, n); @@ -2593,9 +2593,9 @@ CreateDialogBoxD( XtRealizeWidget(parent); /* Set up DialogBox button labels. */ - button_string[0] = CMPSTR(_DtOkString); - button_string[1] = CMPSTR(_DtCancelString); - button_string[2] = CMPSTR(_DtHelpString); + button_string[0] = CMPSTR((String) _DtOkString); + button_string[1] = CMPSTR((String) _DtCancelString); + button_string[2] = CMPSTR((String) _DtHelpString); /* saveRestore * Note that save.poscnt has been initialized elsewhere. diff --git a/cde/programs/dtstyle/Dtwm.c b/cde/programs/dtstyle/Dtwm.c index 08d79c6b..d503e46c 100644 --- a/cde/programs/dtstyle/Dtwm.c +++ b/cde/programs/dtstyle/Dtwm.c @@ -377,9 +377,9 @@ build_dtwmDlg( /* get dtwm resource values */ /* Set up DialogBoxDialog button labels */ - button_string[0] = CMPSTR(_DtOkString); - button_string[1] = CMPSTR(_DtCancelString); - button_string[2] = CMPSTR(_DtHelpString); + button_string[0] = CMPSTR((String) _DtOkString); + button_string[1] = CMPSTR((String) _DtCancelString); + button_string[2] = CMPSTR((String) _DtHelpString); /* Create toplevel DialogBox */ /* saveRestore @@ -834,8 +834,8 @@ ButtonCB( if (dtwm.warnDialog == NULL) { n = 0; - XtSetArg(args[n], XmNokLabelString, CMPSTR(_DtOkString)); n++; - XtSetArg(args[n], XmNcancelLabelString, CMPSTR(_DtCancelString)); n++; + XtSetArg(args[n], XmNokLabelString, CMPSTR((String) _DtOkString)); n++; + XtSetArg(args[n], XmNcancelLabelString, CMPSTR((String) _DtCancelString)); n++; XtSetArg(args[n], XmNborderWidth, 3); n++; XtSetArg(args[n], XmNmwmFunctions, DIALOG_MWM_FUNC ); n++; XtSetArg(args[n], XmNdialogStyle, XmDIALOG_FULL_APPLICATION_MODAL); n++; diff --git a/cde/programs/dtstyle/Font.c b/cde/programs/dtstyle/Font.c index 0d6ba0c0..7c82acd8 100644 --- a/cde/programs/dtstyle/Font.c +++ b/cde/programs/dtstyle/Font.c @@ -217,9 +217,9 @@ CreateFontDlg( font.originalFontIndex = font.selectedFontIndex; /* Set up button labels. */ - button_string[0] = CMPSTR(_DtOkString); - button_string[1] = CMPSTR(_DtCancelString); - button_string[2] = CMPSTR(_DtHelpString); + button_string[0] = CMPSTR((String) _DtOkString); + button_string[1] = CMPSTR((String) _DtCancelString); + button_string[2] = CMPSTR((String) _DtHelpString); /* Create toplevel DialogBox */ /* saveRestore diff --git a/cde/programs/dtstyle/I18nMain.c b/cde/programs/dtstyle/I18nMain.c index 315f2c5e..1a3afbee 100644 --- a/cde/programs/dtstyle/I18nMain.c +++ b/cde/programs/dtstyle/I18nMain.c @@ -376,9 +376,9 @@ BuildI18nDlg( /* get i18n resource values */ /* Set up DialogBoxDialog button labels */ - button_string[0] = CMPSTR(_DtOkString); - button_string[1] = CMPSTR(_DtCancelString); - button_string[2] = CMPSTR(_DtHelpString); + button_string[0] = CMPSTR((String) _DtOkString); + button_string[1] = CMPSTR((String) _DtCancelString); + button_string[2] = CMPSTR((String) _DtHelpString); /* Create toplevel DialogBox */ diff --git a/cde/programs/dtstyle/Keyboard.c b/cde/programs/dtstyle/Keyboard.c index 0898220d..41106be8 100644 --- a/cde/programs/dtstyle/Keyboard.c +++ b/cde/programs/dtstyle/Keyboard.c @@ -167,9 +167,9 @@ build_keyboardDlg( XmString string; /* Set up DialogBoxDialog button labels */ - button_string[0] = CMPSTR(_DtOkString); - button_string[1] = CMPSTR(_DtCancelString); - button_string[2] = CMPSTR(_DtHelpString); + button_string[0] = CMPSTR((String) _DtOkString); + button_string[1] = CMPSTR((String) _DtCancelString); + button_string[2] = CMPSTR((String) _DtHelpString); /* Create toplevel DialogBox */ diff --git a/cde/programs/dtstyle/Main.c b/cde/programs/dtstyle/Main.c index 68b9b6fd..dadfafa1 100644 --- a/cde/programs/dtstyle/Main.c +++ b/cde/programs/dtstyle/Main.c @@ -163,7 +163,7 @@ raiseWindow( Window dialogWin ) { static int changeMask = CWStackMode; - static XWindowChanges windowChanges = {0,0,0,0,0,NULL,Above}; + static XWindowChanges windowChanges = {0,0,0,0,0,0,Above}; XReconfigureWMWindow(style.display, dialogWin, style.screenNum, changeMask, &windowChanges); @@ -242,7 +242,7 @@ ErrDialog( if (style.errDialog == NULL) /* create it */ { - ok = XmStringCreateLocalized(_DtOkString); + ok = XmStringCreateLocalized((String) _DtOkString); n = 0; XtSetArg(args[n], XmNokLabelString, ok); n++; @@ -333,7 +333,7 @@ InfoDialog( style.tmpXmStr = CMPSTR(infoString); if (ok == NULL) - ok = CMPSTR(_DtOkString); + ok = CMPSTR((String) _DtOkString); /* create it */ n = 0; @@ -439,7 +439,7 @@ putDialog( /*++++++++++++++++++++++++++++++++++++++*/ /* main */ /*++++++++++++++++++++++++++++++++++++++*/ -void +int main( int argc, char **argv ) @@ -616,6 +616,7 @@ malloc_trace(0); XtAppMainLoop(XtWidgetToApplicationContext(style.shell)); + return 0; } /************************************************************************ diff --git a/cde/programs/dtstyle/Mouse.c b/cde/programs/dtstyle/Mouse.c index c12181c5..e057f9d1 100644 --- a/cde/programs/dtstyle/Mouse.c +++ b/cde/programs/dtstyle/Mouse.c @@ -397,9 +397,9 @@ build_mouseDialog( Widget shell ) } /* Set up DialogBoxDialog button labels */ - button_string[0] = CMPSTR(_DtOkString); - button_string[1] = CMPSTR(_DtCancelString); - button_string[2] = CMPSTR(_DtHelpString); + button_string[0] = CMPSTR((String) _DtOkString); + button_string[1] = CMPSTR((String) _DtCancelString); + button_string[2] = CMPSTR((String) _DtHelpString); /* Create toplevel DialogBox */ /* saveRestore @@ -1130,8 +1130,8 @@ warnToggleCB( } n = 0; - XtSetArg(args[n], XmNokLabelString, CMPSTR(_DtOkString)); n++; - XtSetArg(args[n], XmNcancelLabelString, CMPSTR(_DtCancelString)); n++; + XtSetArg(args[n], XmNokLabelString, CMPSTR((String) _DtOkString)); n++; + XtSetArg(args[n], XmNcancelLabelString, CMPSTR((String) _DtCancelString)); n++; string = CMPSTR(WARN_MSG); XtSetArg(args[n], XmNmessageString, string); n++; XtSetArg(args[n], XmNmwmFunctions, DIALOG_MWM_FUNC ); n++; @@ -1177,8 +1177,8 @@ midwarnToggleCB( } n = 0; - XtSetArg(args[n], XmNokLabelString, CMPSTR(_DtOkString)); n++; - XtSetArg(args[n], XmNcancelLabelString, CMPSTR(_DtCancelString)); n++; + XtSetArg(args[n], XmNokLabelString, CMPSTR((String) _DtOkString)); n++; + XtSetArg(args[n], XmNcancelLabelString, CMPSTR((String) _DtCancelString)); n++; XtSetArg(args[n], XmNborderWidth, 3); n++; XtSetArg(args[n], XmNmwmFunctions, DIALOG_MWM_FUNC ); n++; XtSetArg(args[n], XmNdialogStyle, XmDIALOG_FULL_APPLICATION_MODAL); n++; diff --git a/cde/programs/dtstyle/Screen.c b/cde/programs/dtstyle/Screen.c index 248a65b7..a4009ce5 100644 --- a/cde/programs/dtstyle/Screen.c +++ b/cde/programs/dtstyle/Screen.c @@ -533,9 +533,9 @@ build_screenDialog( low_res = True; /* Set up DialogBoxDialog button labels */ - button_string[0] = CMPSTR(_DtOkString); - button_string[1] = CMPSTR(_DtCancelString); - button_string[2] = CMPSTR(_DtHelpString); + button_string[0] = CMPSTR((String) _DtOkString); + button_string[1] = CMPSTR((String) _DtCancelString); + button_string[2] = CMPSTR((String) _DtHelpString); /* Create toplevel DialogBox */ /* saveRestore - Note that save.poscnt has been initialized elsewhere. */ diff --git a/cde/programs/dtstyle/Startup.c b/cde/programs/dtstyle/Startup.c index 8c6dc268..c1c39d9d 100644 --- a/cde/programs/dtstyle/Startup.c +++ b/cde/programs/dtstyle/Startup.c @@ -208,9 +208,9 @@ BuildStartup( startup.dlg = NULL; /* Set up DialogBoxDialog button labels */ - button_string[0] = CMPSTR(_DtOkString); - button_string[1] = CMPSTR(_DtCancelString); - button_string[2] = CMPSTR(_DtHelpString); + button_string[0] = CMPSTR((String) _DtOkString); + button_string[1] = CMPSTR((String) _DtCancelString); + button_string[2] = CMPSTR((String) _DtHelpString); /* Create toplevel DialogBox */ /* saveRestore @@ -554,8 +554,8 @@ SetHomeSession( { string = CMPSTR(((char *)GETMESSAGE(7, 11, "This will replace your home session with\nthe current session.\n\n Continue?"))); XtSetArg(args[n], XmNmessageString, string); n++; - okstr = CMPSTR(_DtOkString); - cancelstr = CMPSTR(_DtCancelString); + okstr = CMPSTR((String) _DtOkString); + cancelstr = CMPSTR((String) _DtCancelString); XtSetArg(args[n], XmNokLabelString, okstr); n++; XtSetArg(args[n], XmNcancelLabelString, cancelstr); n++; XtSetArg(args[n], XmNmwmFunctions, DIALOG_MWM_FUNC ); n++;