dtcm: Resolve CID 87408

[oweals/cde.git] / cde / programs / dtcm / dtcm / icon.c

diff --git a/cde/programs/dtcm/dtcm/icon.c b/cde/programs/dtcm/dtcm/icon.c
index ccce5c47a9a405b9fca28a42c29a5c835b852dec..e42ecec68aa14305671fdfb8083fc77ec565614f 100644 (file)
--- a/cde/programs/dtcm/dtcm/icon.c
+++ b/cde/programs/dtcm/dtcm/icon.c
@@ -1,3 +1,25 @@
+/*
+ * CDE - Common Desktop Environment
+ *
+ * Copyright (c) 1993-2012, The Open Group. All rights reserved.
+ *
+ * These libraries and programs are free software; you can
+ * redistribute them and/or modify them under the terms of the GNU
+ * Lesser General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * These libraries and programs are distributed in the hope that
+ * they will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with these librararies and programs; if not, write
+ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110-1301 USA
+ */
 /* $TOG: icon.c /main/5 1998/01/09 15:29:53 cshi $ */
 /*
  *  (c) Copyright 1993, 1994 Hewlett-Packard Company
@@ -138,8 +160,8 @@ load_icons(
 
        /* See if the resolution size we have chosen is acceptable by the WM */
        if (!(size = wm_icon_preference(XtDisplay(c->frame), screen, size))) {
-               c->icon->icon = NULL;
-               c->icon_inverted->icon = NULL;
+               c->icon->icon = 0;
+               c->icon_inverted->icon = 0;
                return (FALSE);
        }
 
@@ -183,22 +205,22 @@ load_icon(
 
        if (!(icon_filename = XmGetIconFileName(screen, NULL, icon_name, 
                                                                NULL, size))) {
-               icon->icon = NULL;
+               icon->icon = 0;
                return (FALSE);
        }
 
        if ((icon->icon = XmGetPixmap(screen, icon_filename, fg, bg)) ==
                                                        XmUNSPECIFIED_PIXMAP) {
                free(icon_filename);
-               icon->icon = NULL;
+               icon->icon = 0;
                return (FALSE);
        }
 
        if ((icon->icon_mask = _DtGetMask(screen, icon_filename)) ==
                                                        XmUNSPECIFIED_PIXMAP) {
                free(icon_filename);
-               icon->icon = NULL;
-               icon->icon_mask = NULL;
+               icon->icon = 0;
+               icon->icon_mask = 0;
                return (FALSE);
        }
 
@@ -225,12 +247,12 @@ free_icon(
        if (icon->icon)
                XmDestroyPixmap(XtScreen(c->frame), icon->icon);
 
-       icon->icon = NULL;
+       icon->icon = 0;
 
        if (icon->icon_mask)
                XmDestroyPixmap(XtScreen(c->frame), icon->icon_mask);
 
-       icon->icon_mask = NULL;
+       icon->icon_mask = 0;
 }
 
 static void