From 2a9b4ec67c9a0b390d9c02b7e1db3ab4f8286f80 Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Thu, 30 Aug 2012 22:30:36 +0100 Subject: [PATCH] dtlogin: Resolve 7 compiler warnings. --- cde/programs/dtlogin/qualify.c | 1 + cde/programs/dtlogin/vgcallback.c | 4 ++-- cde/programs/dtlogin/vglogo.c | 4 ++-- cde/programs/dtlogin/vgmain.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cde/programs/dtlogin/qualify.c b/cde/programs/dtlogin/qualify.c index c9e12716..4d80c883 100644 --- a/cde/programs/dtlogin/qualify.c +++ b/cde/programs/dtlogin/qualify.c @@ -29,6 +29,7 @@ */ #include #include +#include /********************************************************************* * qualifyWithFirst diff --git a/cde/programs/dtlogin/vgcallback.c b/cde/programs/dtlogin/vgcallback.c index 54979169..0cd89fbd 100644 --- a/cde/programs/dtlogin/vgcallback.c +++ b/cde/programs/dtlogin/vgcallback.c @@ -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( diff --git a/cde/programs/dtlogin/vglogo.c b/cde/programs/dtlogin/vglogo.c index c96bac67..49f34f77 100644 --- a/cde/programs/dtlogin/vglogo.c +++ b/cde/programs/dtlogin/vglogo.c @@ -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), diff --git a/cde/programs/dtlogin/vgmain.c b/cde/programs/dtlogin/vgmain.c index edb2feee..485b26fb 100644 --- a/cde/programs/dtlogin/vgmain.c +++ b/cde/programs/dtlogin/vgmain.c @@ -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( -- 2.25.1