dtcm: Resolve CID 87822

[oweals/cde.git] / cde / programs / dtcm / server / cmscalendar.c

diff --git a/cde/programs/dtcm/server/cmscalendar.c b/cde/programs/dtcm/server/cmscalendar.c
index 270d819fa5854a636487844fea69314293f12d9d..4b4d95c252c81d44e2963bf496047a3bdb2b6689 100644 (file)
--- a/cde/programs/dtcm/server/cmscalendar.c
+++ b/cde/programs/dtcm/server/cmscalendar.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
+ */
 /* $XConsortium: cmscalendar.c /main/4 1995/11/09 12:40:39 rswiston $ */
 /*
  *  (c) Copyright 1993, 1994 Hewlett-Packard Company
@@ -270,7 +292,7 @@ _DtCmsSetFileVersion(_DtCmsCalendar *cal, int version)
                if ((cal->types = (int *)calloc(1, sizeof(int) *
                    (_DtCm_entry_name_tbl->size + 1))) == NULL) {
                        _DtCmsFreeCalendar(cal);
-                       return (NULL);
+                       return (0);
                } else
                        _DtCm_get_attribute_types(_DtCm_entry_name_tbl->size,
                                cal->types);
@@ -454,7 +476,7 @@ _DtCmsGetCalendarByName(char *target, boolean_t load, _DtCmsCalendar **cal)
        _DtCmsCalendar *clist = calendar_list;
 
        if ((name = get_calname(target)) == NULL)
-               return (NULL);
+               return (0);
 
        while (clist != NULL) {
                if (strcmp (name, clist->calendar) == 0) {
@@ -1011,7 +1033,7 @@ get_calname(char *target)
        if (ptr == NULL) {
                return (strdup(target));
        } else {
-               *ptr = NULL;
+               *ptr = '\0';
                name = strdup(target);
                *ptr = '@';
                return (name);