From: Jon Trulson <jon@radscan.com>
Date: Sun, 14 Sep 2014 20:25:55 +0000 (-0600)
Subject: ttsnoop: NULL is not 0
X-Git-Tag: 2.2.3~111
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6a9327f2ab0bb09a681b86a45cf4a7bf9e9c28d4;p=oweals%2Fcde.git

ttsnoop: NULL is not 0

This fix is a bit of a hack, I just moved the declarations into the
'user code' portion of main().

dtcodegen needs to be fixed so as not to generate this type of code in
the first place.
---

diff --git a/cde/programs/ttsnoop/ttsnoop.C.src b/cde/programs/ttsnoop/ttsnoop.C.src
index e5fe8758..72dd8fdf 100644
--- a/cde/programs/ttsnoop/ttsnoop.C.src
+++ b/cde/programs/ttsnoop/ttsnoop.C.src
@@ -340,9 +340,6 @@ main(int argc, char **argv)
     XtAppContext	app;
     Atom		save_yourself_atom;
 
-    Pixmap	icon_pixmap = 0;
-    Pixmap	icon_mask_pixmap = 0;
-    
     /**************************************************************************
      *** DTB_USER_CODE_START
      ***
@@ -351,6 +348,9 @@ main(int argc, char **argv)
      *** Add local variables and code.
      ***/
     
+    Pixmap	icon_pixmap = 0;
+    Pixmap	icon_mask_pixmap = 0;
+
     /*
      * The application must call DtTermInitialize() before 
      * initializing the Xt Toolkit with XtAppInitialize(3X).