From bbaaf942bebb26e82808954d57f3d2f708198f7d Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Wed, 22 Dec 2021 01:19:59 +0000 Subject: [PATCH] dtlogin: Resolve uninitialized warnings --- cde/programs/dtlogin/dtchooser.c | 2 +- cde/programs/dtlogin/session.c | 6 ++---- cde/programs/dtlogin/vgcallback.c | 3 ++- cde/programs/dtlogin/xdmcp.c | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cde/programs/dtlogin/dtchooser.c b/cde/programs/dtlogin/dtchooser.c index f213b43eb..ce9b6cee2 100644 --- a/cde/programs/dtlogin/dtchooser.c +++ b/cde/programs/dtlogin/dtchooser.c @@ -667,7 +667,7 @@ MakeDialog( DialogType dtype ) char buffer[128]; char *str; - Widget w, text; + Widget w = NULL, text; Dimension txt_width, txt_height; XmString ok, cancel, nw, sv; diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c index e68b79393..ddf8dc7cf 100644 --- a/cde/programs/dtlogin/session.c +++ b/cde/programs/dtlogin/session.c @@ -365,7 +365,7 @@ void ManageSession( struct display *d ) { int pid; - Window root; + Window root = NULL; /* Display *dpy; */ #ifdef BYPASSLOGIN char *BypassUsername; @@ -1199,8 +1199,6 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp ) long ngroups, groups[NGROUPS]; #endif /* __AFS */ - waitType status; - if (verify->argv) { Debug ("StartSession %s: ", verify->argv[0]); for (f = verify->argv; *f; f++) { @@ -1283,7 +1281,7 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp ) #endif #if !defined(sun) && (!defined(CSRG_BASED) || defined(HAS_PAM_LIBRARY)) - Account(d, user, NULL, getpid(), USER_PROCESS, status); + Account(d, user, NULL, getpid(), USER_PROCESS, 0); #endif #ifdef AIXV3 diff --git a/cde/programs/dtlogin/vgcallback.c b/cde/programs/dtlogin/vgcallback.c index 63f7e338a..3da9a5d3d 100644 --- a/cde/programs/dtlogin/vgcallback.c +++ b/cde/programs/dtlogin/vgcallback.c @@ -1791,7 +1791,7 @@ SetDtLabelAndIcon(void) static void _DtShowDialog( DialogType dtype, XmString msg) { - Widget *w; + Widget *w = NULL; #ifdef VG_TRACE vg_TRACE_EXECUTION("main: entered _DtShowDialog ..."); @@ -1804,6 +1804,7 @@ _DtShowDialog( DialogType dtype, XmString msg) case help: w = &help_message; break; case hostname: w = &hostname_message; break; case help_chooser: w = &help_message; break; + default: return; } if (*w == NULL) diff --git a/cde/programs/dtlogin/xdmcp.c b/cde/programs/dtlogin/xdmcp.c index 0e94d6687..c562eec21 100644 --- a/cde/programs/dtlogin/xdmcp.c +++ b/cde/programs/dtlogin/xdmcp.c @@ -554,8 +554,8 @@ forward_respond (struct sockaddr *from, int fromlen, int length) ARRAY8 clientAddress; ARRAY8 clientPort; ARRAYofARRAY8 authenticationNames; - struct sockaddr *client; - int clientlen; + struct sockaddr *client = NULL; + int clientlen = 0; int expectedLen; int i;