[src/trunk]: src/lib/libc/locale rune.h is not public, so merge with rune_loc...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/lib/libc/locale rune.h is not public, so merge with rune_loc...
From: tnozaki <tnozaki%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 19:01:05 +0000
details:   https://anonhg.NetBSD.org/src/rev/94eb493a4c56
branches:  trunk
changeset: 755076:94eb493a4c56
user:      tnozaki <tnozaki%NetBSD.org@localhost>
date:      Sat May 22 07:18:43 2010 +0000

description:
rune.h is not public, so merge with rune_local.h

diffstat:

 lib/libc/locale/_wctrans.c       |   5 +-
 lib/libc/locale/_wctype.c        |   6 +-
 lib/libc/locale/global_locale.c  |   6 +-
 lib/libc/locale/iswctype_mb.c    |   6 +-
 lib/libc/locale/multibyte_amd1.c |   6 +-
 lib/libc/locale/multibyte_c90.c  |   6 +-
 lib/libc/locale/rune.c           |   5 +-
 lib/libc/locale/rune.h           |  94 ----------------------------------------
 lib/libc/locale/rune_local.h     |  92 ++++++++++++++++++++++++++++++++++++++-
 lib/libc/locale/runeglue.c       |   5 +-
 lib/libc/locale/runetable.c      |   5 +-
 lib/libc/locale/setlocale1.c     |   6 +-
 lib/libc/locale/setlocale32.c    |   6 +-
 13 files changed, 119 insertions(+), 129 deletions(-)

diffs (truncated from 501 to 300 lines):

diff -r 3cb2b9c98c2b -r 94eb493a4c56 lib/libc/locale/_wctrans.c
--- a/lib/libc/locale/_wctrans.c        Sat May 22 07:18:37 2010 +0000
+++ b/lib/libc/locale/_wctrans.c        Sat May 22 07:18:43 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: _wctrans.c,v 1.13 2009/01/18 22:03:19 tnozaki Exp $    */
+/*     $NetBSD: _wctrans.c,v 1.14 2010/05/22 07:18:43 tnozaki Exp $    */
 
 /*-
  * Copyright (c)2003 Citrus Project,
@@ -60,7 +60,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _wctrans.c,v 1.13 2009/01/18 22:03:19 tnozaki Exp $");
+__RCSID("$NetBSD: _wctrans.c,v 1.14 2010/05/22 07:18:43 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -69,7 +69,6 @@
 #include <wctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rune.h"
 #include "rune_local.h"
 #include "_wctrans_local.h"
 
diff -r 3cb2b9c98c2b -r 94eb493a4c56 lib/libc/locale/_wctype.c
--- a/lib/libc/locale/_wctype.c Sat May 22 07:18:37 2010 +0000
+++ b/lib/libc/locale/_wctype.c Sat May 22 07:18:43 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: _wctype.c,v 1.5 2009/01/18 22:03:19 tnozaki Exp $ */
+/* $NetBSD: _wctype.c,v 1.6 2010/05/22 07:18:43 tnozaki Exp $ */
 
 /*-
  * Copyright (c)2008 Citrus Project,
@@ -60,7 +60,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _wctype.c,v 1.5 2009/01/18 22:03:19 tnozaki Exp $");
+__RCSID("$NetBSD: _wctype.c,v 1.6 2010/05/22 07:18:43 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <assert.h>
@@ -68,7 +68,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "rune.h"
+#include "rune_local.h"
 #include "_wctrans_local.h"
 #include "_wctype_local.h"
 
diff -r 3cb2b9c98c2b -r 94eb493a4c56 lib/libc/locale/global_locale.c
--- a/lib/libc/locale/global_locale.c   Sat May 22 07:18:37 2010 +0000
+++ b/lib/libc/locale/global_locale.c   Sat May 22 07:18:43 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: global_locale.c,v 1.6 2010/05/22 06:38:15 tnozaki Exp $ */
+/* $NetBSD: global_locale.c,v 1.7 2010/05/22 07:18:43 tnozaki Exp $ */
 
 /*-
  * Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: global_locale.c,v 1.6 2010/05/22 06:38:15 tnozaki Exp $");
+__RCSID("$NetBSD: global_locale.c,v 1.7 2010/05/22 07:18:43 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -40,7 +40,7 @@
 #include <locale.h>
 #include <stdlib.h>
 #ifdef WITH_RUNE
-#include "rune.h"
+#include "rune_local.h"
 #else
 #include "bsdctype.h"
 #endif
diff -r 3cb2b9c98c2b -r 94eb493a4c56 lib/libc/locale/iswctype_mb.c
--- a/lib/libc/locale/iswctype_mb.c     Sat May 22 07:18:37 2010 +0000
+++ b/lib/libc/locale/iswctype_mb.c     Sat May 22 07:18:43 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iswctype_mb.c,v 1.6 2010/03/27 22:14:09 tnozaki Exp $ */
+/* $NetBSD: iswctype_mb.c,v 1.7 2010/05/22 07:18:43 tnozaki Exp $ */
 
 /*-
  * Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: iswctype_mb.c,v 1.6 2010/03/27 22:14:09 tnozaki Exp $");
+__RCSID("$NetBSD: iswctype_mb.c,v 1.7 2010/05/22 07:18:43 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -45,7 +45,7 @@
 
 #include "setlocale_local.h"
 
-#include "rune.h"
+#include "rune_local.h"
 #include "_wctype_local.h"
 #include "_wctrans_local.h"
 
diff -r 3cb2b9c98c2b -r 94eb493a4c56 lib/libc/locale/multibyte_amd1.c
--- a/lib/libc/locale/multibyte_amd1.c  Sat May 22 07:18:37 2010 +0000
+++ b/lib/libc/locale/multibyte_amd1.c  Sat May 22 07:18:43 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: multibyte_amd1.c,v 1.7 2009/01/11 02:46:28 christos Exp $      */
+/*     $NetBSD: multibyte_amd1.c,v 1.8 2010/05/22 07:18:43 tnozaki Exp $       */
 
 /*-
  * Copyright (c)2002, 2008 Citrus Project,
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: multibyte_amd1.c,v 1.7 2009/01/11 02:46:28 christos Exp $");
+__RCSID("$NetBSD: multibyte_amd1.c,v 1.8 2010/05/22 07:18:43 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -43,7 +43,7 @@
 
 #include "citrus_module.h"
 #include "citrus_ctype.h"
-#include "rune.h"
+#include "rune_local.h"
 #include "multibyte.h"
 
 #define _RUNE_LOCALE() \
diff -r 3cb2b9c98c2b -r 94eb493a4c56 lib/libc/locale/multibyte_c90.c
--- a/lib/libc/locale/multibyte_c90.c   Sat May 22 07:18:37 2010 +0000
+++ b/lib/libc/locale/multibyte_c90.c   Sat May 22 07:18:43 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: multibyte_c90.c,v 1.6 2009/01/11 02:46:28 christos Exp $       */
+/*     $NetBSD: multibyte_c90.c,v 1.7 2010/05/22 07:18:43 tnozaki Exp $        */
 
 /*-
  * Copyright (c)2002, 2008 Citrus Project,
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: multibyte_c90.c,v 1.6 2009/01/11 02:46:28 christos Exp $");
+__RCSID("$NetBSD: multibyte_c90.c,v 1.7 2010/05/22 07:18:43 tnozaki Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -44,7 +44,7 @@
 
 #include "citrus_module.h"
 #include "citrus_ctype.h"
-#include "rune.h"
+#include "rune_local.h"
 
 #define _RUNE_LOCALE() \
     ((_RuneLocale *)(*_current_locale())->part_impl[(size_t)LC_CTYPE])
diff -r 3cb2b9c98c2b -r 94eb493a4c56 lib/libc/locale/rune.c
--- a/lib/libc/locale/rune.c    Sat May 22 07:18:37 2010 +0000
+++ b/lib/libc/locale/rune.c    Sat May 22 07:18:43 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rune.c,v 1.34 2010/05/22 06:38:15 tnozaki Exp $        */
+/*     $NetBSD: rune.c,v 1.35 2010/05/22 07:18:43 tnozaki Exp $        */
 
 /*-
  * Copyright (c)1999 Citrus Project,
@@ -63,7 +63,7 @@
 #if 0
 static char sccsid[] = "@(#)rune.c     8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: rune.c,v 1.34 2010/05/22 06:38:15 tnozaki Exp $");
+__RCSID("$NetBSD: rune.c,v 1.35 2010/05/22 07:18:43 tnozaki Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -81,7 +81,6 @@
 #include "citrus_ctype.h"
 
 #include "bsdctype.h"
-#include "rune.h"
 #include "rune_local.h"
 
 static int readrange __P((_RuneLocale *, _RuneRange *, _FileRuneRange *, void *, FILE *));
diff -r 3cb2b9c98c2b -r 94eb493a4c56 lib/libc/locale/rune.h
--- a/lib/libc/locale/rune.h    Sat May 22 07:18:37 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/*     $NetBSD: rune.h,v 1.18 2010/05/22 06:38:15 tnozaki Exp $        */
-
-/*-
- * Copyright (c) 1993
- *     The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *     @(#)rune.h      8.1 (Berkeley) 6/27/93
- */
-
-#ifndef        _RUNE_H_
-#define        _RUNE_H_
-
-#include <stdio.h>
-#include <wchar.h>
-#include "runetype_local.h"
-
-/*
- * map _RTYPE_x to _CTYPE_x
- *
- * XXX: these should be defined in ctype.h and used in isxxx macros.
- *      (note: current isxxx macros use "old" NetBSD masks and
- *       _CTYPE_x are not public.)
- */
-#define        _CTYPE_A        _RUNETYPE_A
-#define        _CTYPE_C        _RUNETYPE_C
-#define        _CTYPE_D        _RUNETYPE_D
-#define        _CTYPE_G        _RUNETYPE_G
-#define        _CTYPE_L        _RUNETYPE_L
-#define        _CTYPE_P        _RUNETYPE_P
-#define        _CTYPE_S        _RUNETYPE_S
-#define        _CTYPE_U        _RUNETYPE_U
-#define        _CTYPE_X        _RUNETYPE_X
-#define        _CTYPE_B        _RUNETYPE_B
-#define        _CTYPE_R        _RUNETYPE_R
-#define        _CTYPE_I        _RUNETYPE_I
-#define        _CTYPE_T        _RUNETYPE_T
-#define        _CTYPE_Q        _RUNETYPE_Q
-#define        _CTYPE_SWM      _RUNETYPE_SWM
-#define        _CTYPE_SWS      _RUNETYPE_SWS
-#define        _CTYPE_SW0      _RUNETYPE_SW0
-#define        _CTYPE_SW1      _RUNETYPE_SW1
-#define        _CTYPE_SW2      _RUNETYPE_SW2
-#define        _CTYPE_SW3      _RUNETYPE_SW3
-
-/*
- * Other namespace conversion.
- */
-
-#define _RUNE_ISCACHED         _NB_RUNE_ISCACHED
-#define _DEFAULT_INVALID_RUNE  _NB_DEFAULT_INVALID_RUNE
-#define _RuneEntry             _NBRuneEntry
-#define _RuneRange             _NBRuneRange
-#define _RuneLocale            _NBRuneLocale
-#define _RUNE_MAGIC_1          _NB_RUNE_MAGIC_1
-#define _RUNE_MODULE_1         _NB_RUNE_MODULE_1
-#define _RUNE_CODESET          _NB_RUNE_CODESET
-
-/*
- * global variables
- */
-extern size_t __mb_len_max_runtime;
-#define __MB_LEN_MAX_RUNTIME   __mb_len_max_runtime
-
-extern const _RuneLocale _DefaultRuneLocale;
-extern const _RuneLocale *_CurrentRuneLocale;
-
-#endif /*! _RUNE_H_ */
diff -r 3cb2b9c98c2b -r 94eb493a4c56 lib/libc/locale/rune_local.h
--- a/lib/libc/locale/rune_local.h      Sat May 22 07:18:37 2010 +0000
+++ b/lib/libc/locale/rune_local.h      Sat May 22 07:18:43 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rune_local.h,v 1.12 2009/01/11 02:46:29 christos Exp $ */
+/*     $NetBSD: rune_local.h,v 1.13 2010/05/22 07:18:43 tnozaki Exp $  */
 
 /*-
  * Copyright (c) 2000 Citrus Project,
@@ -26,9 +26,97 @@
  * SUCH DAMAGE.
  */
 
+/*-
+ * Copyright (c) 1993
Prev by Date: [src/trunk]: src 1. hide _CTYPE_PRIVATE section in ctype.h, move them to priv...
Next by Date: [src/trunk]: src/usr.bin/mklocale include ctype_local.h
Previous by Thread: [src/trunk]: src 1. hide _CTYPE_PRIVATE section in ctype.h, move them to priv...
Next by Thread: [src/trunk]: src/usr.bin/mklocale include ctype_local.h
Indexes:
Home | Main Index | Thread Index | Old Index