From dd9423a67a7650a9b0f50d8151e4f3797c5a14f8 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 11 Jun 2003 21:57:23 +0000 Subject: Update. 2003-06-11 Ulrich Drepper * allocatestack.c (queue_stack): Always inline. * ptreadhP.h (__do_cancel): Likewise. --- iconvdata/cns11643.h | 4 +++- iconvdata/cns11643l1.h | 4 +++- iconvdata/euc-kr.c | 3 ++- iconvdata/gb2312.h | 4 +++- iconvdata/jis0201.h | 4 +++- iconvdata/jis0208.h | 4 +++- iconvdata/jis0212.h | 4 +++- iconvdata/jisx0213.h | 4 +++- iconvdata/ksc5601.h | 7 ++++++- iconvdata/utf-7.c | 4 ++-- 10 files changed, 31 insertions(+), 11 deletions(-) (limited to 'iconvdata') diff --git a/iconvdata/cns11643.h b/iconvdata/cns11643.h index 5117533ab4..125f55f228 100644 --- a/iconvdata/cns11643.h +++ b/iconvdata/cns11643.h @@ -1,5 +1,5 @@ /* Access functions for CNS 11643 handling. - Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -40,6 +40,7 @@ extern const uint32_t __cns11643l15_to_ucs4_tab[]; static inline uint32_t +__attribute ((always_inline)) cns11643_to_ucs4 (const char **s, size_t avail, unsigned char offset) { unsigned char ch = *(*s); @@ -140,6 +141,7 @@ extern const char __cns11643_from_ucs4p2c_tab[][3]; static inline size_t +__attribute ((always_inline)) ucs4_to_cns11643 (uint32_t wch, char *s, size_t avail) { unsigned int ch = (unsigned int) wch; diff --git a/iconvdata/cns11643l1.h b/iconvdata/cns11643l1.h index be99888ab7..e4b8655b0a 100644 --- a/iconvdata/cns11643l1.h +++ b/iconvdata/cns11643l1.h @@ -1,5 +1,5 @@ /* Access functions for CNS 11643, plane 1 handling. - Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -26,6 +26,7 @@ extern const uint16_t __cns11643l1_to_ucs4_tab[]; static inline uint32_t +__attribute ((always_inline)) cns11643l1_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset) { @@ -71,6 +72,7 @@ extern const char __cns11643l1_from_ucs4_tab14[][2]; static inline size_t +__attribute ((always_inline)) ucs4_to_cns11643l1 (uint32_t wch, unsigned char *s, size_t avail) { unsigned int ch = (unsigned int) wch; diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c index 7774720bd6..289ff4c419 100644 --- a/iconvdata/euc-kr.c +++ b/iconvdata/euc-kr.c @@ -1,5 +1,5 @@ /* Mapping tables for EUC-KR handling. - Copyright (C) 1998, 1999, 2000-2002 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000-2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jungshik Shin and Ulrich Drepper , 1998. @@ -25,6 +25,7 @@ static inline void +__attribute ((always_inline)) euckr_from_ucs4 (uint32_t ch, unsigned char *cp) { if (ch > 0x9f) diff --git a/iconvdata/gb2312.h b/iconvdata/gb2312.h index c6856515c1..f5eaaf2224 100644 --- a/iconvdata/gb2312.h +++ b/iconvdata/gb2312.h @@ -1,5 +1,5 @@ /* Access functions for GB2312 conversion. - Copyright (C) 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -30,6 +30,7 @@ extern const uint16_t __gb2312_to_ucs[]; static inline uint32_t +__attribute ((always_inline)) gb2312_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset) { unsigned char ch = *(*s); @@ -67,6 +68,7 @@ extern const char __gb2312_from_ucs4_tab8[][2]; extern const char __gb2312_from_ucs4_tab9[][2]; static inline size_t +__attribute ((always_inline)) ucs4_to_gb2312 (uint32_t wch, unsigned char *s, size_t avail) { unsigned int ch = (unsigned int) wch; diff --git a/iconvdata/jis0201.h b/iconvdata/jis0201.h index 6fae3a2883..391e6d3f7c 100644 --- a/iconvdata/jis0201.h +++ b/iconvdata/jis0201.h @@ -1,5 +1,5 @@ /* Access functions for JISX0201 conversion. - Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -26,6 +26,7 @@ extern const uint32_t __jisx0201_to_ucs4[]; static inline uint32_t +__attribute ((always_inline)) jisx0201_to_ucs4 (char ch) { uint32_t val = __jisx0201_to_ucs4[(unsigned char) ch]; @@ -38,6 +39,7 @@ jisx0201_to_ucs4 (char ch) static inline size_t +__attribute ((always_inline)) ucs4_to_jisx0201 (uint32_t wch, char *s) { char ch; diff --git a/iconvdata/jis0208.h b/iconvdata/jis0208.h index ef6b891eb6..9dea38973c 100644 --- a/iconvdata/jis0208.h +++ b/iconvdata/jis0208.h @@ -1,5 +1,5 @@ /* Access functions for JISX0208 conversion. - Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -43,6 +43,7 @@ struct jisx0208_ucs_idx static inline uint32_t +__attribute ((always_inline)) jisx0208_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset) { unsigned char ch = *(*s); @@ -70,6 +71,7 @@ jisx0208_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset) static inline size_t +__attribute ((always_inline)) ucs4_to_jisx0208 (uint32_t wch, char *s, size_t avail) { unsigned int ch = (unsigned int) wch; diff --git a/iconvdata/jis0212.h b/iconvdata/jis0212.h index f57778ebab..ba439e53eb 100644 --- a/iconvdata/jis0212.h +++ b/iconvdata/jis0212.h @@ -1,5 +1,5 @@ /* Access functions for JISX0212 conversion. - Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -42,6 +42,7 @@ extern const char __jisx0212_from_ucs[][2]; static inline uint32_t +__attribute ((always_inline)) jisx0212_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset) { const struct jisx0212_idx *rp = __jisx0212_to_ucs_idx; @@ -77,6 +78,7 @@ jisx0212_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset) static inline size_t +__attribute ((always_inline)) ucs4_to_jisx0212 (uint32_t wch, char *s, size_t avail) { const struct jisx0212_idx *rp = __jisx0212_from_ucs_idx; diff --git a/iconvdata/jisx0213.h b/iconvdata/jisx0213.h index 5632e523bc..c92c70fdee 100644 --- a/iconvdata/jisx0213.h +++ b/iconvdata/jisx0213.h @@ -1,5 +1,5 @@ /* Functions for JISX0213 conversion. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible , 2002. @@ -32,6 +32,7 @@ extern const uint16_t __jisx0213_from_ucs_level2[]; #define NELEMS(arr) (sizeof (arr) / sizeof (arr[0])) static inline uint32_t +__attribute ((always_inline)) jisx0213_to_ucs4 (unsigned int row, unsigned int col) { uint32_t val; @@ -64,6 +65,7 @@ jisx0213_to_ucs4 (unsigned int row, unsigned int col) } static inline uint16_t +__attribute ((always_inline)) ucs4_to_jisx0213 (uint32_t ucs) { if (ucs < NELEMS (__jisx0213_from_ucs_level1) << 6) diff --git a/iconvdata/ksc5601.h b/iconvdata/ksc5601.h index 50e74fc985..603a337f89 100644 --- a/iconvdata/ksc5601.h +++ b/iconvdata/ksc5601.h @@ -1,5 +1,5 @@ /* Access functions for KS C 5601-1992 based encoding conversion. - Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -44,6 +44,7 @@ extern const struct map __ksc5601_hanja_from_ucs[KSC5601_HANJA]; static inline uint32_t +__attribute ((always_inline)) ksc5601_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset) { unsigned char ch = **s; @@ -85,6 +86,7 @@ ksc5601_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset) } static inline size_t +__attribute ((always_inline)) ucs4_to_ksc5601_hangul (uint32_t wch, unsigned char *s, size_t avail) { int l = 0; @@ -116,6 +118,7 @@ ucs4_to_ksc5601_hangul (uint32_t wch, unsigned char *s, size_t avail) static inline size_t +__attribute ((always_inline)) ucs4_to_ksc5601_hanja (uint32_t wch, unsigned char *s, size_t avail) { int l = 0; @@ -146,6 +149,7 @@ ucs4_to_ksc5601_hanja (uint32_t wch, unsigned char *s, size_t avail) } static inline size_t +__attribute ((always_inline)) ucs4_to_ksc5601_sym (uint32_t wch, unsigned char *s, size_t avail) { int l = 0; @@ -177,6 +181,7 @@ ucs4_to_ksc5601_sym (uint32_t wch, unsigned char *s, size_t avail) static inline size_t +__attribute ((always_inline)) ucs4_to_ksc5601 (uint32_t wch, unsigned char *s, size_t avail) { if (wch >= 0xac00 && wch <= 0xd7a3) diff --git a/iconvdata/utf-7.c b/iconvdata/utf-7.c index 64cf614208..ee2ae441b0 100644 --- a/iconvdata/utf-7.c +++ b/iconvdata/utf-7.c @@ -1,5 +1,5 @@ /* Conversion module for UTF-7. - Copyright (C) 2000-2002 Free Software Foundation, Inc. + Copyright (C) 2000-2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible , 2000. @@ -93,7 +93,7 @@ isxbase64 (uint32_t ch) /* Converts a value in the range 0..63 to a base64 encoded char. */ -static inline unsigned char +static unsigned char base64 (unsigned int i) { if (i < 26) -- cgit 1.4.1