From e4990096468bd506b2dc25725fd22e8a235d7353 Mon Sep 17 00:00:00 2001 From: yamt Date: Sat, 3 Aug 2002 11:10:51 +0000 Subject: [PATCH] remove _StreamStateTable. --- lib/libc/locale/runetable.c | 6 ++---- lib/libc/locale/runetype.h | 3 +-- lib/libc/locale/setrunelocale.c | 8 ++------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/lib/libc/locale/runetable.c b/lib/libc/locale/runetable.c index ce15716b7ce0..ed4b5552c420 100644 --- a/lib/libc/locale/runetable.c +++ b/lib/libc/locale/runetable.c @@ -1,4 +1,4 @@ -/* $NetBSD: runetable.c,v 1.8 2002/03/17 22:14:31 tshiozak Exp $ */ +/* $NetBSD: runetable.c,v 1.9 2002/08/03 11:10:51 yamt Exp $ */ /*- * Copyright (c) 1993 @@ -43,7 +43,7 @@ #if 0 static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 6/27/93"; #else -__RCSID("$NetBSD: runetable.c,v 1.8 2002/03/17 22:14:31 tshiozak Exp $"); +__RCSID("$NetBSD: runetable.c,v 1.9 2002/08/03 11:10:51 yamt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -267,6 +267,4 @@ _RuneLocale _DefaultRuneLocale = { _RuneLocale *_CurrentRuneLocale = &_DefaultRuneLocale; -void **_StreamStateTable = NULL; - char *_PathLocale; diff --git a/lib/libc/locale/runetype.h b/lib/libc/locale/runetype.h index 1a3068bc4788..10a915ea415c 100644 --- a/lib/libc/locale/runetype.h +++ b/lib/libc/locale/runetype.h @@ -1,4 +1,4 @@ -/* $NetBSD: runetype.h,v 1.9 2002/03/18 22:58:44 tshiozak Exp $ */ +/* $NetBSD: runetype.h,v 1.10 2002/08/03 11:10:51 yamt Exp $ */ /*- * Copyright (c) 1993 @@ -190,7 +190,6 @@ typedef struct _RuneLocale { extern _RuneLocale _DefaultRuneLocale; extern _RuneLocale *_CurrentRuneLocale; -extern void **_StreamStateTable; extern char *_PathLocale; #endif /* !_RUNETYPE_H_ */ diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c index 87266a274e0c..2069cfa8e090 100644 --- a/lib/libc/locale/setrunelocale.c +++ b/lib/libc/locale/setrunelocale.c @@ -1,4 +1,4 @@ -/* $NetBSD: setrunelocale.c,v 1.12 2002/04/17 13:40:35 kleink Exp $ */ +/* $NetBSD: setrunelocale.c,v 1.13 2002/08/03 11:10:51 yamt Exp $ */ /*- * Copyright (c)1999 Citrus Project, @@ -100,7 +100,7 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: setrunelocale.c,v 1.12 2002/04/17 13:40:35 kleink Exp $"); +__RCSID("$NetBSD: setrunelocale.c,v 1.13 2002/08/03 11:10:51 yamt Exp $"); #endif /* LIBC_SCCS and not lint */ #include "namespace.h" @@ -175,10 +175,6 @@ _newrunelocale(path) found: fclose(fp); - if (_StreamStateTable) { - free(_StreamStateTable); - _StreamStateTable = NULL; - } rl->rl_citrus_ctype = NULL; ret = _citrus_ctype_open(&rl->rl_citrus_ctype, rl->rl_encoding,