diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-07 11:45:07 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2016-01-07 11:45:07 +0000 |
commit | 670a687dea6773147a227bebfa9d801dae739ee0 (patch) | |
tree | 380b348ef7d52bd144e78f4a661dda0b40e87477 /timezone/ialloc.c | |
parent | 45c4f3665aaa63cab148cc9cc96fa07c666c1c38 (diff) | |
download | glibc-670a687dea6773147a227bebfa9d801dae739ee0.tar.gz glibc-670a687dea6773147a227bebfa9d801dae739ee0.tar.xz glibc-670a687dea6773147a227bebfa9d801dae739ee0.zip |
Update timezone code from tzcode 2015g.
This patch updates the timezone code from tzcode 2015g. The Makefile and README changes are based on those in Paul's patch <https://sourceware.org/ml/libc-alpha/2015-05/msg00553.html>. Tested for x86_64 and x86. 2016-01-06 Paul Eggert <eggert@cs.ucla.edu> Joseph Myers <joseph@codesourcery.com> * timezone/private.h: Update from tzcode 2015g. * timezone/tzfile.h: Likewise. * timezone/tzselect.ksh: Likewise. * timezone/zdump.c: Likewise. * timezone/zic.c: Likewise. * timezone/ialloc.c: Remove file. * timezone/scheck.c: Likewise. * timezone/Makefile (extra-objs): Remove variable. ($(objpfx)zic): Do not depend on scheck.o and ialloc.o. (tz-cflags): Add -DHAVE_GETTEXT -DUSE_LTZ=0 -Wno-maybe-uninitialized. (CFLAGS-zdump.c): Remove -fwrapv -DNOID -DHAVE_GETTEXT. (CFLAGS-zic.c): Remove -DNOID -DHAVE_GETTEXT. (CFLAGS-ialloc.c): Remove variable. (CFLAGS-scheck.c): Likewise. * timezone/README: Update list of files from tzcode.
Diffstat (limited to 'timezone/ialloc.c')
-rw-r--r-- | timezone/ialloc.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/timezone/ialloc.c b/timezone/ialloc.c deleted file mode 100644 index b6f018897b..0000000000 --- a/timezone/ialloc.c +++ /dev/null @@ -1,32 +0,0 @@ -/* -** This file is in the public domain, so clarified as of -** 2006-07-17 by Arthur David Olson. -*/ - -/*LINTLIBRARY*/ - -#include "private.h" - -char * -icatalloc(char *const old, const char *const new) -{ - register char * result; - register int oldsize, newsize; - - newsize = (new == NULL) ? 0 : strlen(new); - if (old == NULL) - oldsize = 0; - else if (newsize == 0) - return old; - else oldsize = strlen(old); - if ((result = realloc(old, oldsize + newsize + 1)) != NULL) - if (new != NULL) - (void) strcpy(result + oldsize, new); - return result; -} - -char * -icpyalloc(const char *const string) -{ - return icatalloc(NULL, string); -} |