dtstyle: Resolve 70 compiler warnings

diff --git a/cde/programs/dtstyle/Audio.c b/cde/programs/dtstyle/Audio.c
index 427449d232d116654f7f58db8fd9cc3f4ab0c81d..4ae748126bcc86f250d9ee7ca233fdf3d1ac68f8 100644 (file)
--- 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 0760cfb8c5d21d85dad743ecbca0c53abbf011f3..7beb4687272b18ed136c9a058d68873dc394167d 100644 (file)
--- 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 9e0676333b3046260843dafac6df2b3664e3a41b..eeb32b389eff4261ea5a2201ef5cb1c1e2e9f932 100644 (file)
--- 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 40d04c47a53ab49416b77cb6f35f946aeccbcc9f..80d9513103e99a5a852d639114f50fcdaacc846f 100644 (file)
--- 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 08d79c6b53c33537ba46579feee00cef8329df40..d503e46c01dbd6c654489a94c2102e4300a0c92d 100644 (file)
--- 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 0d6ba0c0188c990495fd3eb8e815f8a6dd1ae2cb..7c82acd880b15e020e0aca394df7de69deee5649 100644 (file)
--- 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 315f2c5ebef6bfa35cf7d29bb3c7ef18881ea048..1a3afbeef10c6c8d3dd3d15bf717c9fc86de7210 100644 (file)
--- 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 0898220dacce5b1572c838536a672b2d73aa05da..41106be8eae74b2e3f395f1ebf63afdc8c8c50e9 100644 (file)
--- 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 68b9b6fd6d39df1d65c4629072a06da508d897bb..dadfafa1e60b458c28ef5cd54100fca390f2f2e9 100644 (file)
--- 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 c12181c5fa0daa6c27db98c0ad2b5b3fd800c7a4..e057f9d173b3618fe6e0598a5cc1f36c348e95c3 100644 (file)
--- 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 248a65b7b51d00976709b3a55a923de161b2dbed..a4009ce5f781e2fe0cace821c8cdb39f64c5ec5c 100644 (file)
--- 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 8c6dc268d925d0cdbb71e061ba59fec0a5ab113b..c1c39d9d18dd25ae72363281f5999b4ef47a2ee5 100644 (file)
--- 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++;