dtstyle: Resolve 28 compiler warnings.

diff --git a/cde/programs/dtstyle/Audio.c b/cde/programs/dtstyle/Audio.c
index 871aff7f60e4db4f7fa42bbe3d8d2960d906e9a8..427449d232d116654f7f58db8fd9cc3f4ab0c81d 100644 (file)
--- a/cde/programs/dtstyle/Audio.c
+++ b/cde/programs/dtstyle/Audio.c
@@ -650,7 +650,7 @@ restoreAudio(
     XrmValue value;
 
     xrm_name [0] = XrmStringToQuark ("audioDlg");
-    xrm_name [2] = NULL;
+    xrm_name [2] = 0;
 
     /* get x position */
     xrm_name [1] = XrmStringToQuark ("x");

diff --git a/cde/programs/dtstyle/Backdrop.c b/cde/programs/dtstyle/Backdrop.c
index f1c2e16fb035c1fac7b266b907e33e53a5d2f9a6..33c48e1d9bdb31bb9ffa382b6fc2542c9349bfe7 100644 (file)
--- a/cde/programs/dtstyle/Backdrop.c
+++ b/cde/programs/dtstyle/Backdrop.c
@@ -552,7 +552,7 @@ static
      ReadBitmaps( void )
 {
   int            status;
-  Pixmap         tmpPix = NULL;
+  Pixmap         tmpPix = 0;
   int            width, height, x, y;
   Window         win;
   int            num;
@@ -589,7 +589,7 @@ static
     {
       /* give error dialog, free space, and return */
       backdrops.errStr = (char *)XtMalloc(strlen(ERR2) + 1);
-      sprintf(backdrops.errStr, ERR2);
+      sprintf(backdrops.errStr, "%s", ERR2);
       ErrDialog (backdrops.errStr, style.shell); 
       FreeAll();      
       free_dirList(backdrops.dirList, backdrops.dirCount);
@@ -608,7 +608,7 @@ static
     {
       /* give error dialog, free space, and return */
       backdrops.errStr = (char *)XtMalloc(strlen(ERR2) + 1);
-      sprintf(backdrops.errStr, ERR2);
+      sprintf(backdrops.errStr, "%s", ERR2);
       ErrDialog (backdrops.errStr, style.shell); 
       FreeAll();  
       free_dirList(backdrops.dirList, backdrops.dirCount);
@@ -1129,7 +1129,7 @@ restoreBackdrop(
     XrmValue value;
 
     xrm_name [0] = XrmStringToQuark (BACKDROPSDLG);
-    xrm_name [2] = NULL;
+    xrm_name [2] = 0;
 
     /* get x position */
     xrm_name [1] = XrmStringToQuark ("x");

diff --git a/cde/programs/dtstyle/ColorEdit.c b/cde/programs/dtstyle/ColorEdit.c
index c992658fd93c7f8f56d5958f6037fd3a426fce32..9e0676333b3046260843dafac6df2b3664e3a41b 100644 (file)
--- a/cde/programs/dtstyle/ColorEdit.c
+++ b/cde/programs/dtstyle/ColorEdit.c
@@ -1615,7 +1615,7 @@ restoreColorEdit(
   XrmValue value;
 
     xrm_name [0] = XrmStringToQuark ("colorEditDlg");
-    xrm_name [2] = NULL;
+    xrm_name [2] = 0;
 
     /* get x position */
     xrm_name [1] = XrmStringToQuark ("x");

diff --git a/cde/programs/dtstyle/ColorMain.c b/cde/programs/dtstyle/ColorMain.c
index 8d97d3c952ab4834351e36a8e7b30274291ff1f9..40d04c47a53ab49416b77cb6f35f946aeccbcc9f 100644 (file)
--- a/cde/programs/dtstyle/ColorMain.c
+++ b/cde/programs/dtstyle/ColorMain.c
@@ -2323,7 +2323,7 @@ restoreColor(
 
     /*"paletteDlg" is the resource name of the dialog shell we are saving for.*/
     xrm_name [0] = XrmStringToQuark (PALETTEDLG);
-    xrm_name [2] = NULL;
+    xrm_name [2] = 0;
 
     /* get x position */
     xrm_name [1] = XrmStringToQuark ("x");
@@ -2343,7 +2343,7 @@ restoreColor(
        strcpy(defaultName_restore, value.addr);
     }
     else
-       defaultName_restore[0] = NULL;
+       defaultName_restore[0] = 0;
 
     /* get selected button */
     xrm_name [1] = XrmStringToQuark ("selected_button");

diff --git a/cde/programs/dtstyle/Dtwm.c b/cde/programs/dtstyle/Dtwm.c
index 578b3e9a5f16cece78c2821bd767b60fbd350220..08d79c6b53c33537ba46579feee00cef8329df40 100644 (file)
--- a/cde/programs/dtstyle/Dtwm.c
+++ b/cde/programs/dtstyle/Dtwm.c
@@ -911,7 +911,7 @@ restoreDtwm(
     XrmValue value;
 
     xrm_name [0] = XrmStringToQuark ("dtwmDlg");
-    xrm_name [2] = NULL;
+    xrm_name [2] = 0;
 
     /* get x position */
     xrm_name [1] = XrmStringToQuark ("x");

diff --git a/cde/programs/dtstyle/Font.c b/cde/programs/dtstyle/Font.c
index d573a12ecebd024a1952b832e5d7f381762932e4..777d41bea2d8e119e3d3bc94533b6f23b2a733fc 100644 (file)
--- a/cde/programs/dtstyle/Font.c
+++ b/cde/programs/dtstyle/Font.c
@@ -685,7 +685,7 @@ restoreFonts(
     XrmValue value;
 
     xrm_name [0] = XrmStringToQuark ("Fonts");
-    xrm_name [2] = NULL;
+    xrm_name [2] = 0;
 
     /* get x position */
     xrm_name [1] = XrmStringToQuark ("x");

diff --git a/cde/programs/dtstyle/I18nMain.c b/cde/programs/dtstyle/I18nMain.c
index 4f508c5788d56cc1e64545a78a17bd038afd16ad..cea3c9f6bad831eb24543c55fc1bb448c024e719 100644 (file)
--- a/cde/programs/dtstyle/I18nMain.c
+++ b/cde/programs/dtstyle/I18nMain.c
@@ -1131,7 +1131,7 @@ restoreI18n(
     XrmValue value;
 
     xrm_name [0] = XrmStringToQuark ("i18nDlg");
-    xrm_name [2] = NULL;
+    xrm_name [2] = 0;
 
     /* get x position */
     xrm_name [1] = XrmStringToQuark ("x");

diff --git a/cde/programs/dtstyle/Keyboard.c b/cde/programs/dtstyle/Keyboard.c
index 58421cf675d8c578970aea0ad152c985b384b139..0898220dacce5b1572c838536a672b2d73aa05da 100644 (file)
--- a/cde/programs/dtstyle/Keyboard.c
+++ b/cde/programs/dtstyle/Keyboard.c
@@ -569,7 +569,7 @@ restoreKeybd(
     XrmValue value;
 
     xrm_name [0] = XrmStringToQuark ("keyboardDlg");
-    xrm_name [2] = NULL;
+    xrm_name [2] = 0;
 
     /* get x position */
     xrm_name [1] = XrmStringToQuark ("x");

diff --git a/cde/programs/dtstyle/MainWin.c b/cde/programs/dtstyle/MainWin.c
index 337702644933b1c709f73efa43ce2f1b949a5588..c48761d70d682fa13cf12de95a3037551f202396 100644 (file)
--- a/cde/programs/dtstyle/MainWin.c
+++ b/cde/programs/dtstyle/MainWin.c
@@ -198,7 +198,7 @@ build_mainWindow(
 
     n = 0;
     tmpStr = (char *)XtMalloc(strlen(GETMESSAGE(4, 1, "Style Manager"))+1);
-    sprintf(tmpStr, GETMESSAGE(4, 1, "Style Manager"));
+    sprintf(tmpStr, "%s", GETMESSAGE(4, 1, "Style Manager"));
     XtSetArg(args[n], XmNtitle, tmpStr); n++;
     XtSetArg(args[n], XmNiconName, 
         (char *)GETMESSAGE(4, 37, "Style")); n++;
@@ -474,68 +474,68 @@ ProcessComponentList(
       {
           cmp_string = CMPSTR(GETMESSAGE(4, 27, "Color"));
           helpTag = HELP_COLOR_BUTTON;
-         dtIcon = _DtGetIconFileName(style.screen, COLOR_ICON, NULL, NULL, NULL);
+         dtIcon = _DtGetIconFileName(style.screen, COLOR_ICON, NULL, NULL, 0);
           style.workProcs = True;          
       }
       else if (strcmp(string, FONT) == 0)
       {
           cmp_string = CMPSTR(GETMESSAGE(4, 28, "Font"));
-         dtIcon = _DtGetIconFileName(style.screen, FONT_ICON, NULL, NULL, NULL);
+         dtIcon = _DtGetIconFileName(style.screen, FONT_ICON, NULL, NULL, 0);
           helpTag = HELP_FONT_BUTTON;
       }
 
       else if (strcmp(string, BACKDROP) == 0)
       {
           cmp_string = CMPSTR(GETMESSAGE(4, 29, "Backdrop"));
-         dtIcon = _DtGetIconFileName(style.screen, BACKDROP_ICON, NULL, NULL, NULL);
+         dtIcon = _DtGetIconFileName(style.screen, BACKDROP_ICON, NULL, NULL, 0);
           helpTag = HELP_BACKDROP_BUTTON;
       }
 
       else if (strcmp(string, KEYBOARD) == 0)
       {
           cmp_string = CMPSTR(GETMESSAGE(4, 30, "Keyboard"));
-         dtIcon = _DtGetIconFileName(style.screen, KEYBOARD_ICON, NULL, NULL, NULL);     
+         dtIcon = _DtGetIconFileName(style.screen, KEYBOARD_ICON, NULL, NULL, 0);        
           helpTag = HELP_KEYBOARD_BUTTON;        
       }
 
       else if (strcmp(string, MOUSE) == 0)
       {
           cmp_string = CMPSTR(GETMESSAGE(4, 31, "Mouse"));
-         dtIcon = _DtGetIconFileName(style.screen, MOUSE_ICON, NULL, NULL, NULL);        
+         dtIcon = _DtGetIconFileName(style.screen, MOUSE_ICON, NULL, NULL, 0);   
           helpTag = HELP_MOUSE_BUTTON;
       }
 
       else if (strcmp(string, BEEP) == 0)
       {
           cmp_string = CMPSTR(GETMESSAGE(4, 32, "Beep"));
-         dtIcon = _DtGetIconFileName(style.screen, BEEP_ICON, NULL, NULL, NULL);         
+         dtIcon = _DtGetIconFileName(style.screen, BEEP_ICON, NULL, NULL, 0);    
           helpTag = HELP_AUDIO_BUTTON;
       }
 
       else if (strcmp(string, SCREEN) == 0)
       {
           cmp_string = CMPSTR(GETMESSAGE(4, 33, "Screen"));
-         dtIcon = _DtGetIconFileName(style.screen, SCREEN_ICON, NULL, NULL, NULL);       
+         dtIcon = _DtGetIconFileName(style.screen, SCREEN_ICON, NULL, NULL, 0);          
           helpTag = HELP_SCREEN_BUTTON;
       }
 
       else if (strcmp(string, DTWM) == 0)
       {
           cmp_string = CMPSTR(GETMESSAGE(4, 38, "Window"));
-         dtIcon = _DtGetIconFileName(style.screen, DTWM_ICON, NULL, NULL, NULL);         
+         dtIcon = _DtGetIconFileName(style.screen, DTWM_ICON, NULL, NULL, 0);    
           helpTag = HELP_DTWM_BUTTON;
       }
 
       else if (strcmp(string, STARTUP) == 0)
       {
           cmp_string = CMPSTR(GETMESSAGE(4, 35, "Startup"));
-         dtIcon = _DtGetIconFileName(style.screen, STARTUP_ICON, NULL, NULL, NULL);      
+         dtIcon = _DtGetIconFileName(style.screen, STARTUP_ICON, NULL, NULL, 0);         
           helpTag = HELP_STARTUP_BUTTON;
       }
       else if (strcmp(string, I18N) == 0)
       {
           cmp_string = CMPSTR(GETMESSAGE(4, 34, "Intl'"));
-         dtIcon = _DtGetIconFileName(style.screen, I18N_ICON, NULL, NULL, NULL);         
+         dtIcon = _DtGetIconFileName(style.screen, I18N_ICON, NULL, NULL, 0);    
           helpTag = HELP_I18N_BUTTON;        
       }
       else
@@ -717,7 +717,7 @@ restoreMain(
 
     xrm_name [0] = XrmStringToQuark ("mainWindow");
     xrm_name [1] = XrmStringToQuark ("ismapped");
-    xrm_name [2] = NULL;
+    xrm_name [2] = 0;
 
     if (XrmQGetResource (db, xrm_name, xrm_name, &rep_type, &value)) {
       /* Are we supposed to be mapped? */

diff --git a/cde/programs/dtstyle/Mouse.c b/cde/programs/dtstyle/Mouse.c
index b963b8053dd00744bc711979060e0e4a387b8077..c12181c5fa0daa6c27db98c0ad2b5b3fd800c7a4 100644 (file)
--- a/cde/programs/dtstyle/Mouse.c
+++ b/cde/programs/dtstyle/Mouse.c
@@ -1706,7 +1706,7 @@ restoreMouse(
     XrmValue value;
 
     xrm_name [0] = XrmStringToQuark ("Mouse");
-    xrm_name [2] = NULL;
+    xrm_name [2] = 0;
 
     /* get x position */
     xrm_name [1] = XrmStringToQuark ("x");

diff --git a/cde/programs/dtstyle/Screen.c b/cde/programs/dtstyle/Screen.c
index 997aa5ecb2594e2f562db4452959bae879260055..00a5e00a350474a28a5719f3c0f035bc27da7562 100644 (file)
--- a/cde/programs/dtstyle/Screen.c
+++ b/cde/programs/dtstyle/Screen.c
@@ -2843,7 +2843,7 @@ restoreScreen(
     XrmValue value;
 
     xrm_name [0] = XrmStringToQuark ("Screen");
-    xrm_name [2] = NULL;
+    xrm_name [2] = 0;
 
     /* get x position */
     xrm_name [1] = XrmStringToQuark ("x");

diff --git a/cde/programs/dtstyle/Startup.c b/cde/programs/dtstyle/Startup.c
index 6d59c748d20344cbfd191f76ad2ea5bfd8cb6f06..8c6dc268d925d0cdbb71e061ba59fec0a5ab113b 100644 (file)
--- a/cde/programs/dtstyle/Startup.c
+++ b/cde/programs/dtstyle/Startup.c
@@ -139,7 +139,7 @@ popup_startupBB(
 
     if (style.startupDialog == NULL) 
     {
-      if (smWindow != NULL)
+      if (smWindow != 0)
       {
           if (style.smState.smCompatMode) 
           {
@@ -660,7 +660,7 @@ restoreStartup(
   XrmValue value;
 
     xrm_name [0] = XrmStringToQuark ("startupDlg");
-    xrm_name [2] = NULL;
+    xrm_name [2] = 0;
 
     /* get x position */
     xrm_name [1] = XrmStringToQuark ("x");