X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ftime_r.c;h=97be6c200f53aaaee7aa39c46655728a61b52a3d;hb=f96458bc2604b8ce5f632387d2d948287376b023;hp=6c425041268a9b4814c5263823ce6735a4b0228e;hpb=19de357924ce11db4f950d862c391c26dc90decb;p=gnulib.git diff --git a/lib/time_r.c b/lib/time_r.c index 6c4250412..97be6c200 100644 --- a/lib/time_r.c +++ b/lib/time_r.c @@ -1,6 +1,6 @@ /* Reentrant time functions like localtime_r. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2010-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,25 +14,13 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Written by Paul Eggert. */ -#if HAVE_CONFIG_H -# include -#endif +#include -#include "time_r.h" - -#include - -static char * -copy_string_result (char *dest, char const *src) -{ - if (! src) - return 0; - return strcpy (dest, src); -} +#include static struct tm * copy_tm_result (struct tm *dest, struct tm const *src) @@ -44,18 +32,6 @@ copy_tm_result (struct tm *dest, struct tm const *src) } -char * -asctime_r (struct tm const * restrict tm, char * restrict buf) -{ - return copy_string_result (buf, asctime (tm)); -} - -char * -ctime_r (time_t const *t, char *buf) -{ - return copy_string_result (buf, ctime (t)); -} - struct tm * gmtime_r (time_t const * restrict t, struct tm * restrict tp) {