X-Git-Url: http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu%2Fglibc.git;a=blobdiff_plain;f=time%2Flocaltime.c;h=148879274d6d41d2a6be79db27acddcc932278f3;hp=9dea58f857addf28ead68680ffd963f151ef3048;hb=f8f163be7e94ff936153e93c73ce8283bfb82236;hpb=062006ea523d653424dad5b80f254af932225a2f

diff --git a/time/localtime.c b/time/localtime.c
index 9dea58f857..148879274d 100644
--- a/time/localtime.c
+++ b/time/localtime.c
@@ -1,51 +1,44 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with the GNU C Library; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#include <ansidecl.h>
-#include <localeinfo.h>
-#include <stddef.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+/* Convert `time_t' to `struct tm' in local time zone.
+   Copyright (C) 1991, 92, 93, 95, 96, 97, 98 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
 #include <time.h>
 
+/* The C Standard says that localtime and gmtime return the same pointer.  */
+struct tm _tmbuf;
+
 
-/* Return the `struct tm' representation of *TIMER in the local timezone.  */
+/* Return the `struct tm' representation of *T in local time,
+   using *TP to store the result.  */
 struct tm *
-DEFUN(localtime, (timer), CONST time_t *timer)
+__localtime_r (t, tp)
+     const time_t *t;
+     struct tm *tp;
 {
-  extern int EXFUN(__tz_compute, (time_t, struct tm));
-  register struct tm *tp;
-
-  if (timer == NULL)
-    {
-      errno = EINVAL;
-      return NULL;
-    }
-
-  tp = gmtime(timer);
-  if (tp == NULL)
-    return NULL;
+  return __tz_convert (t, 1, tp);
+}
+weak_alias (__localtime_r, localtime_r)
 
-  if (!__tz_compute(*timer, *tp))
-    return NULL;
 
-  tp = __offtime(timer, __timezone);
-  tp->tm_isdst = __daylight;
-  return tp;
+/* Return the `struct tm' representation of *T in local time.  */
+struct tm *
+localtime (t)
+     const time_t *t;
+{
+  return __tz_convert (t, 1, &_tmbuf);
 }