summary refs log tree commit diff
path: root/iconvdata/iso-2022-jp.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-19 21:12:06 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-19 21:12:06 +0000
commitd620426811688301eb1cbe6e63773d6430b2706e (patch)
tree555eb9182298ec1e56db8a5de4f62daa2e654321 /iconvdata/iso-2022-jp.c
parent01da56ba764e6abc52bfe9a1feeb79d3d67346d1 (diff)
downloadglibc-d620426811688301eb1cbe6e63773d6430b2706e.tar.gz
glibc-d620426811688301eb1cbe6e63773d6430b2706e.tar.xz
glibc-d620426811688301eb1cbe6e63773d6430b2706e.zip
Update.
2000-06-19  Ulrich Drepper  <drepper@redhat.com>

	* iconv/gconv.h (__gconv_trans_fct): Add new parameter.
	General namespace cleanup.
	(struct __gconv_trans_data): Add next field.
	(struct __gconv_step_data): Make __trans a pointer.
	* iconv/gconv_conf.c: Split out code to find gconv directories from
	__gconv_read_conf in new functions.
	* iconv/gconv_int.h: Define new data structure and declare new
	functions for handling of gconv directory list.
	* iconv/gconv_open.c: Allow more than one error handling step being
	used.  Call function to load error handling module if it is none
	of the builtin transformations.
	* iconv/gconv_close.c: Add code to free transliteration data.
	* iconv/gconv_trans.c: Add functions to load and unload modules
	implementing transliteration etc.
	* iconv/skeleton.c: Call all context functions now that more than
	one module is allowed.
	* iconv/loop.c (STANDARD_ERR_HANDLING): New macro.
	* iconv/gconv_simple.c: Use STANDARD_ERR_HANDLING macro for places
	where the full error handling using transliteration is needed.
	* iconvdata/8bit-gap.c: Likewise.
	* iconvdata/8bit-generic.c: Likewise.
	* iconvdata/ansi_x3.110.c: Likewise.
	* iconvdata/big5.c: Likewise.
	* iconvdata/big5hkscs.c: Likewise.
	* iconvdata/euc-cn.c: Likewise.
	* iconvdata/euc-jp.c: Likewise.
	* iconvdata/euc-kr.c: Likewise.
	* iconvdata/euc-tw.c: Likewise.
	* iconvdata/gbgbk.c: Likewise.
	* iconvdata/gbk.c: Likewise.
	* iconvdata/iso-2022-cn.c: Likewise.
	* iconvdata/iso-2022-jp.c: Likewise.
	* iconvdata/iso-2022-kr.c: Likewise.
	* iconvdata/iso646.c: Likewise.
	* iconvdata/iso8859-1.c: Likewise.
	* iconvdata/iso_6937-2.c: Likewise.
	* iconvdata/iso_6937.c: Likewise.
	* iconvdata/johab.c: Likewise.
	* iconvdata/sjis.c: Likewise.
	* iconvdata/t.61.c: Likewise.
	* iconvdata/uhc.c: Likewise.
	* iconvdata/unicode.c: Likewise.
	* iconvdata/utf-16.c: Likewise.
	* libio/iofwide.c: Reset __trans member of __gconv_trans_data
	structure correctly after last change.
	* wcsmbs/btowc.c: Likewise.
	* wcsmbs/mbrtowc.c: Likewise.
	* wcsmbs/mbsnrtowcs.c: Likewise.
	* wcsmbs/mbsrtowcs.c: Likewise.
	* wcsmbs/wcrtomb.c: Likewise.
	* wcsmbs/wcsnrtombs.c: Likewise.
	* wcsmbs/wcsrtombs.c: Likewise.
	* wcsmbs/wctob.c: Likewise.

	* localedata/Makefile: Set -Wno-format for some files since gcc does
	not know all the format specifiers.

2000-06-18  Ulrich Drepper  <drepper@redhat.com>

	* locale/loadlocale.c (_nl_unload_locale): Remove a bit of
	unneeded code.
	* locale/lc-time.c (_nl_init_era_entries): Likewise.
Diffstat (limited to 'iconvdata/iso-2022-jp.c')
-rw-r--r--iconvdata/iso-2022-jp.c44
1 files changed, 2 insertions, 42 deletions
diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c
index ab42bcc75c..ecfdae4e47 100644
--- a/iconvdata/iso-2022-jp.c
+++ b/iconvdata/iso-2022-jp.c
@@ -703,26 +703,7 @@ gconv_end (struct __gconv_step *data)
 		else if (__builtin_expect (var, iso2022jp2) == iso2022jp)     \
 		  {							      \
 		    /* We have no other choice.  */			      \
-		    if (step_data->__trans.__trans_fct != NULL)		      \
-		      {							      \
-			result = DL_CALL_FCT (step_data->__trans.__trans_fct, \
-					      (step, step_data, *inptrp,      \
-					       &inptr, inend, &outptr,	      \
-					       irreversible));		      \
-			if (result != __GCONV_OK)			      \
-			  break;					      \
-		      }							      \
-		    else if (! ignore_errors_p ())			      \
-		      {							      \
-			result = __GCONV_ILLEGAL_INPUT;			      \
-			break;						      \
-		      }							      \
-		    else						      \
-		      {							      \
-			inptr += 4;					      \
-			++*irreversible;				      \
-		      }							      \
-		    continue;						      \
+		    STANDARD_ERR_HANDLER (4);				      \
 		  }							      \
 		else							      \
 		  {							      \
@@ -888,28 +869,7 @@ gconv_end (struct __gconv_step *data)
 				      }					      \
 				    else				      \
 				      {					      \
-					if (step_data->__trans.__trans_fct    \
-					    != NULL)			      \
-					  {				      \
-					    result = DL_CALL_FCT	      \
-  					      (step_data->__trans.__trans_fct,\
-					       (step, step_data, *inptrp,     \
-						&inptr, inend, &outptr,	      \
-						irreversible));		      \
-					    if (result != __GCONV_OK)	      \
-					      break;			      \
-					  }				      \
-					else if (! ignore_errors_p ())	      \
-					  {				      \
-					     result = __GCONV_ILLEGAL_INPUT;  \
-					     break;			      \
-					  }				      \
-					else				      \
-					  {				      \
-					    ++*irreversible;		      \
-					    inptr += 4;			      \
-					  }				      \
-					continue;			      \
+					STANDARD_ERR_HANDLER (4);	      \
 				      }					      \
 				  }					      \
 			      }						      \