diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | stdio-common/tmpnam.c | 14 |
2 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 1c7c700249..64054b58f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +1998-09-10 Ulrich Drepper <drepper@cygnus.com> + + * stdio-common/tmpnam.c: Move local static variable buf to + toplevel and rename to tmpnam_buffer to ease debugging. + Patch by Joe Keane <jgk@jgk.org>. + Optimize s == NULL case a bit. + 1998-09-10 12:51 Ulrich Drepper <drepper@cygnus.com> * resolv/res_init.c (res_init): Initialize _res.nscount and diff --git a/stdio-common/tmpnam.c b/stdio-common/tmpnam.c index e5c6bf166d..0bbb318953 100644 --- a/stdio-common/tmpnam.c +++ b/stdio-common/tmpnam.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1993, 1996, 1997, 1998 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 @@ -19,6 +19,8 @@ #include <stdio.h> #include <string.h> +static char tmpnam_buffer[L_tmpnam]; + /* Generate a unique filename in P_tmpdir. This function is *not* thread safe! */ @@ -27,7 +29,6 @@ tmpnam (char *s) { /* By using two buffers we manage to be thread safe in the case where S != NULL. */ - static char buf[L_tmpnam]; char tmpbuf[L_tmpnam]; /* In the following call we use the buffer pointed to by S if @@ -40,10 +41,7 @@ tmpnam (char *s) return NULL; if (s == NULL) - { - memcpy (buf, tmpbuf, L_tmpnam); - return buf; - } - else - return s; + return (char *) memcpy (tmpnam_buffer, tmpbuf, L_tmpnam); + + return s; } |