dtcm: Resolve CID 87822

[oweals/cde.git] / cde / programs / dtcm / libDtCmP / timeops.c

diff --git a/cde/programs/dtcm/libDtCmP/timeops.c b/cde/programs/dtcm/libDtCmP/timeops.c
index 4f408b55e446175a5fec25641f681380fcfc3004..c17d4b5c321509031c3984815ef8476619cf11cf 100644 (file)
--- a/cde/programs/dtcm/libDtCmP/timeops.c
+++ b/cde/programs/dtcm/libDtCmP/timeops.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
+ */
 /*******************************************************************************
 **
 **  timeops.c
@@ -36,7 +58,13 @@ static char sccsid[] = "@(#)timeops.c 1.13 95/05/02 Copyr 1991 Sun Microsystems,
 
 #define XOS_USE_NO_LOCKING
 #define X_INCLUDE_TIME_H
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
+#if defined(linux)
+#define SVR4
+#endif
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -895,7 +923,7 @@ xytoclock(int x, int y, Tick t)
        Tick tick;
        _Xltimeparams localtime_buf;
 
-       memset(&timestruct, NULL, sizeof(struct tm));
+       memset(&timestruct, 0, sizeof(struct tm));
 
        tm      = *_XLocaltime(&t, localtime_buf);
        mn      = tm.tm_mon + 1;
@@ -980,6 +1008,7 @@ init_time()
        _Xltimeparams localtime_buf;
        _Xgtimeparams gmtime_buf;
 
+#ifdef SVR4
        /* Fix for QAR 31607 */
        tzset();
        if (getenv("TZ") == NULL){
@@ -989,6 +1018,7 @@ init_time()
                putenv(tzptr);
                tzset();
        }
+#endif
 
        t               = now();
        tm              = *_XLocaltime(&t, localtime_buf);
@@ -1064,7 +1094,7 @@ monthdayyear(int m, int d, int y)
 
        struct tm timestruct;
 
-       memset(&timestruct, NULL, sizeof(struct tm));
+       memset(&timestruct, 0, sizeof(struct tm));
        timestruct.tm_mon = m - 1;
        timestruct.tm_mday = d;
        timestruct.tm_year = y - 1900;