From 341fdfbe7138deaa24252a25790b937bf27601fd Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Fri, 24 Dec 2021 17:00:13 +0000 Subject: [PATCH] various: Window objects should be initialised to 0 not NULL --- cde/programs/dtksh/dtkcmds.c | 2 +- cde/programs/dtlogin/session.c | 2 +- cde/programs/dtprintinfo/libUI/MotifUI/MainWindow.C | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cde/programs/dtksh/dtkcmds.c b/cde/programs/dtksh/dtkcmds.c index 292860cdb..13b1c56f5 100644 --- a/cde/programs/dtksh/dtkcmds.c +++ b/cde/programs/dtksh/dtkcmds.c @@ -2476,7 +2476,7 @@ invokeXDrawFunction( char * functionName = argv[0]; Display * display; Window drawable; - Window destination = NULL; + Window destination = 0; int srcX = 0, srcY = 0; int destX = 0, destY = 0; unsigned int width = 0, height = 0; diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c index ed036cc36..20461ff36 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 = NULL; + Window root = 0; /* Display *dpy; */ #ifdef BYPASSLOGIN char *BypassUsername; diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/MainWindow.C b/cde/programs/dtprintinfo/libUI/MotifUI/MainWindow.C index 39497a603..17194a5fd 100644 --- a/cde/programs/dtprintinfo/libUI/MotifUI/MainWindow.C +++ b/cde/programs/dtprintinfo/libUI/MotifUI/MainWindow.C @@ -222,7 +222,7 @@ void MainWindow::PopupMenu(Widget widget, XtPointer client_data, { XRectangle pixmap_rect, label_rect; XButtonEvent * ev; - Window child, parent = NULL, root; + Window child, parent = 0, root; int root_x, root_y, win_x, win_y; unsigned int modMask; Display * display = XtDisplay(widget);