dtlogin: Resolve 7 compiler warnings.
authorPeter Howkins <flibble@users.sourceforge.net>
Thu, 30 Aug 2012 21:30:36 +0000 (22:30 +0100)
committerPeter Howkins <flibble@users.sourceforge.net>
Thu, 30 Aug 2012 21:30:36 +0000 (22:30 +0100)
cde/programs/dtlogin/qualify.c
cde/programs/dtlogin/vgcallback.c
cde/programs/dtlogin/vglogo.c
cde/programs/dtlogin/vgmain.c

index c9e12716c54a275689b63f7315146200a7f4f6bd..4d80c883df915496802d5c3e3c3904e298ae864f 100644 (file)
@@ -29,6 +29,7 @@
  */
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 /*********************************************************************
  * qualifyWithFirst
index 549791690c1acbeadc534efdd230f149dbc72529..0cd89fbdccf500af2f603a0d43a952af8b8e3bdf 100644 (file)
@@ -817,7 +817,7 @@ MenuItemCB( Widget w, XtPointer client_data, XtPointer call_data )
            temp_p = logoFile;
  
         logoName = _DtGetIconFileName(DefaultScreenOfDisplay(dpyinfo.dpy),
-                          temp_p, NULL, NULL, NULL);
+                          temp_p, NULL, NULL, 0);
  
         if (logoName == NULL) {
            LogError( 
@@ -1740,7 +1740,7 @@ SetDtLabelAndIcon()
  
   logoName = _DtGetIconFileName(
                        DefaultScreenOfDisplay(dpyinfo.dpy),
-                        temp_p, NULL, NULL, NULL);
+                        temp_p, NULL, NULL, 0);
  
   if (logoName == NULL) {
         LogError(
index c96bac674949c7221426ff49808f7d3adefc2b96..49f34f779c38bc16127fdb0a88acc5f76905cd33 100644 (file)
@@ -180,9 +180,9 @@ MakeLogo( void )
 /*
  * On AIX4 we have a Dtlogo.s.pm
  */
-# define LOGO_TYPE (LOWRES ? DtSMALL : NULL)
+# define LOGO_TYPE (LOWRES ? DtSMALL : 0)
 #else 
-# define LOGO_TYPE NULL
+# define LOGO_TYPE 0
 #endif
     
     logoName = _DtGetIconFileName(DefaultScreenOfDisplay(dpyinfo.dpy), 
index edb2feee89e9cfeef452d3c73c78baa70bbb1aa9..485b26fb3ffb9d018f4af7d9db2144f8bcca8585 100644 (file)
@@ -896,7 +896,7 @@ char            *temp_p;
          /* 
           * Make sure the key file exists.
           */
-         if (stat( temp_p, &statb) == NULL) { 
+         if (stat( temp_p, &statb) == 0) { 
 
            j = InitArg(ToggleBG);
            if (XrmGetResource(