summary refs log tree commit diff
path: root/time/strftime.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-10-10 01:07:18 +0000
committerUlrich Drepper <drepper@redhat.com>1996-10-10 01:07:18 +0000
commitb33f91e91da81059b388c8f8ee0d0024212eb180 (patch)
treea9b0a80b8567c0d4e24a74f0c45e52a4a3a8962a /time/strftime.c
parent11336c165c25e5a467335ca742674b1d5ad6d982 (diff)
downloadglibc-b33f91e91da81059b388c8f8ee0d0024212eb180.tar.gz
glibc-b33f91e91da81059b388c8f8ee0d0024212eb180.tar.xz
glibc-b33f91e91da81059b388c8f8ee0d0024212eb180.zip
update from main archive 961009 cvs/libc-961011 cvs/libc-961010
Wed Oct  9 00:24:52 1996  Jim Meyering  <meyering@asic.sc.ti.com>

	* time/strftime.c: Allow old K&R compilers compile this file.

Wed Oct  9 12:03:56 1996  Ulrich Drepper  <drepper@cygnus.com>

	* posix/execlp.c: Add first argument parameter to be compliant
	with POSIX.  Rearrange body to start vararg counter after
	this new argument.

Wed Oct  9 04:34:50 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/sys/procfs.h: Rewrite.  We cannot use
	simply a wrapper around the <linux.elfcore.h> file since the
	kernel header is not clean enough.  We provide the definitions
	in this file instead.

Wed Oct  9 01:43:18 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/gethostid.c (sethostid): Avoid
	get?id calls by using __libc_enable_secure.
Diffstat (limited to 'time/strftime.c')
-rw-r--r--time/strftime.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/time/strftime.c b/time/strftime.c
index 36088d04c9..4014826b50 100644
--- a/time/strftime.c
+++ b/time/strftime.c
@@ -658,8 +658,11 @@ strftime (s, maxsize, format, tp)
 
 	case 's':		/* GNU extension.  */
   	  {
-	    struct tm ltm = *tp;
-	    time_t t = mktime (&ltm);
+	    struct tm ltm;
+	    time_t t;
+
+	    ltm = *tp;
+	    t = mktime (&ltm);
 
 	    /* Generate string value for T using time_t arithmetic;
 	       this works even if sizeof (long) < sizeof (time_t).  */
@@ -818,8 +821,11 @@ strftime (s, maxsize, format, tp)
 	    diff = tp->tm_gmtoff;
 #else
 	    struct tm gtm;
-	    struct tm ltm = *tp;
-	    time_t lt = mktime (&ltm);
+	    struct tm ltm;
+	    time_t lt;
+
+	    ltm = *tp;
+	    lt = mktime (&ltm);
 
 	    if (lt == (time_t) -1)
 	      {