summaryrefslogtreecommitdiff
path: root/timezone/scheck.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-02-02 09:24:43 +0000
committerJakub Jelinek <jakub@redhat.com>2006-02-02 09:24:43 +0000
commitc3a8c11b0c6a6e44e98dcd4bb0fdb397e4fd56f7 (patch)
tree06122af4d2362ce1d73b832105580ff1904433ff /timezone/scheck.c
parent8e3cf1ca614800e0baf9f20ec5027a19216bdb66 (diff)
2006-02-02 Roland McGrath <roland@redhat.com>cvs/fedora-glibc-2_3_90-33
* timezone/private.h: Update from tzcode2006a. * timezone/scheck.c: Likewise. * timezone/asia: Update from tzdata2006a. * timezone/northamerica: Likewise. * timezone/zone.tab: Likewise. * sysdeps/powerpc/powerpc64/Makefile (no-special-regs): New variable. (CFLAGS-mcount.c): Use it instead of -msoft-float. * sysdeps/powerpc/powerpc64/elf/Makefile (CFLAGS-dl-runtime.os, CFLAGS-dl-lookup.os, CFLAGS-dl-misc.os, CFLAGS-rtld-mempcpy.os, CFLAGS-rtld-memmove.os, CFLAGS-rtld-memchr.os, CFLAGS-rtld-strnlen.os): LIkewise 2006-02-01 Roland McGrath <roland@redhat.com> * sysdeps/ieee754/ldbl-opt/Makefile (sysdep-CFLAGS): Avoid adding -mlong-double-128 when it's already there.
Diffstat (limited to 'timezone/scheck.c')
-rw-r--r--timezone/scheck.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/timezone/scheck.c b/timezone/scheck.c
index 2dd9b35285..bc156379a0 100644
--- a/timezone/scheck.c
+++ b/timezone/scheck.c
@@ -1,6 +1,6 @@
#ifndef lint
#ifndef NOID
-static char elsieid[] = "@(#)scheck.c 8.16";
+static char elsieid[] = "@(#)scheck.c 8.17";
#endif /* !defined lint */
#endif /* !defined NOID */
@@ -8,20 +8,19 @@ static char elsieid[] = "@(#)scheck.c 8.16";
#include "private.h"
-char *
+const char *
scheck(string, format)
const char * const string;
-char * const format;
+const char * const format;
{
register char * fbuf;
register const char * fp;
register char * tp;
register int c;
- register char * result;
+ register const char * result;
char dummy;
- static char nada;
- result = &nada;
+ result = "";
if (string == NULL || format == NULL)
return result;
fbuf = imalloc((int) (2 * strlen(format) + 4));