summary refs log tree commit diff
path: root/iconv/gconv_builtin.h
diff options
context:
space:
mode:
Diffstat (limited to 'iconv/gconv_builtin.h')
-rw-r--r--iconv/gconv_builtin.h43
1 files changed, 19 insertions, 24 deletions
diff --git a/iconv/gconv_builtin.h b/iconv/gconv_builtin.h
index 351d6a0342..185dd80125 100644
--- a/iconv/gconv_builtin.h
+++ b/iconv/gconv_builtin.h
@@ -29,21 +29,17 @@ BUILTIN_ALIAS ("OSF00010104//", "ISO-10646/UCS4/") /* level 1 */
 BUILTIN_ALIAS ("OSF00010105//", "ISO-10646/UCS4/") /* level 2 */
 BUILTIN_ALIAS ("OSF00010106//", "ISO-10646/UCS4/") /* level 3 */
 
-BUILTIN_TRANSFORMATION (NULL, "INTERNAL", 8,
-			"ISO-10646/UCS4/", 1, "=INTERNAL->ucs4",
+BUILTIN_TRANSFORMATION ("INTERNAL", "ISO-10646/UCS4/", 1, "=INTERNAL->ucs4",
 			__gconv_transform_internal_ucs4, NULL, NULL,
 			4, 4, 4, 4)
-BUILTIN_TRANSFORMATION (NULL, "ISO-10646/UCS4/", 15,
-			"INTERNAL", 1, "=ucs4->INTERNAL",
+BUILTIN_TRANSFORMATION ("ISO-10646/UCS4/", "INTERNAL", 1, "=ucs4->INTERNAL",
 			__gconv_transform_ucs4_internal, NULL, NULL,
 			4, 4, 4, 4)
 
-BUILTIN_TRANSFORMATION (NULL, "INTERNAL", 8,
-			"UCS-4LE//", 1, "=INTERNAL->ucs4le",
+BUILTIN_TRANSFORMATION ("INTERNAL", "UCS-4LE//", 1, "=INTERNAL->ucs4le",
 			__gconv_transform_internal_ucs4le, NULL, NULL,
 			4, 4, 4, 4)
-BUILTIN_TRANSFORMATION (NULL, "UCS-4LE//", 15,
-			"INTERNAL", 1, "=ucs4le->INTERNAL",
+BUILTIN_TRANSFORMATION ("UCS-4LE//", "INTERNAL", 1, "=ucs4le->INTERNAL",
 			__gconv_transform_ucs4le_internal, NULL, NULL,
 			4, 4, 4, 4)
 
@@ -52,13 +48,14 @@ BUILTIN_ALIAS ("UTF-8//", "ISO-10646/UTF8/")
 BUILTIN_ALIAS ("ISO-IR-193//", "ISO-10646/UTF8/")
 BUILTIN_ALIAS ("OSF05010001//", "ISO-10646/UTF8/")
 
-BUILTIN_TRANSFORMATION (NULL, "INTERNAL", 8,
-			"ISO-10646/UTF8/", 1, "=INTERNAL->utf8",
+BUILTIN_TRANSFORMATION ("INTERNAL", "ISO-10646/UTF8/", 1, "=INTERNAL->utf8",
 			__gconv_transform_internal_utf8, NULL, NULL,
 			4, 4, 1, 6)
 
-BUILTIN_TRANSFORMATION ("ISO-10646/UTF-?8/", "ISO-10646/UTF", 13,
-			"INTERNAL", 1, "=utf8->INTERNAL",
+BUILTIN_TRANSFORMATION ("ISO-10646/UTF-8/", "INTERNAL", 1, "=utf8->INTERNAL",
+			__gconv_transform_utf8_internal, NULL, NULL,
+			1, 6, 4, 4)
+BUILTIN_TRANSFORMATION ("ISO-10646/UTF8/", "INTERNAL", 1, "=utf8->INTERNAL",
 			__gconv_transform_utf8_internal, NULL, NULL,
 			1, 6, 4, 4)
 
@@ -68,13 +65,11 @@ BUILTIN_ALIAS ("OSF00010100//", "ISO-10646/UCS2/") /* level 1 */
 BUILTIN_ALIAS ("OSF00010101//", "ISO-10646/UCS2/") /* level 2 */
 BUILTIN_ALIAS ("OSF00010102//", "ISO-10646/UCS2/") /* level 3 */
 
-BUILTIN_TRANSFORMATION (NULL, "ISO-10646/UCS2/", 15, "INTERNAL",
-			1, "=ucs2->INTERNAL",
+BUILTIN_TRANSFORMATION ("ISO-10646/UCS2/", "INTERNAL", 1, "=ucs2->INTERNAL",
 			__gconv_transform_ucs2_internal, NULL, NULL,
 			2, 2, 4, 4)
 
-BUILTIN_TRANSFORMATION (NULL, "INTERNAL", 8, "ISO-10646/UCS2/",
-			1, "=INTERNAL->ucs2",
+BUILTIN_TRANSFORMATION ("INTERNAL", "ISO-10646/UCS2/", 1, "=INTERNAL->ucs2",
 			__gconv_transform_internal_ucs2, NULL, NULL,
 			4, 4, 2, 2)
 
@@ -85,13 +80,13 @@ BUILTIN_ALIAS ("UCS-2BE//", "ISO-10646/UCS2/")
 
 BUILTIN_ALIAS ("UCS-2LE//", "UNICODELITTLE//")
 
-BUILTIN_TRANSFORMATION (NULL, "UNICODELITTLE//", 15, "INTERNAL",
-			1, "=ucs2reverse->INTERNAL",
+BUILTIN_TRANSFORMATION ("UNICODELITTLE//", "INTERNAL", 1,
+			"=ucs2reverse->INTERNAL",
 			__gconv_transform_ucs2reverse_internal, NULL, NULL,
 			2, 2, 4, 4)
 
-BUILTIN_TRANSFORMATION (NULL, "INTERNAL", 8, "UNICODELITTLE//",
-			1, "=INTERNAL->ucs2reverse",
+BUILTIN_TRANSFORMATION ("INTERNAL", "UNICODELITTLE//", 1,
+			"=INTERNAL->ucs2reverse",
 			__gconv_transform_internal_ucs2reverse, NULL, NULL,
 			4, 4, 2, 2)
 #else
@@ -100,13 +95,13 @@ BUILTIN_ALIAS ("UCS-2LE//", "ISO-10646/UCS2/")
 
 BUILTIN_ALIAS ("UCS-2BE//", "UNICODEBIG//")
 
-BUILTIN_TRANSFORMATION (NULL, "UNICODEBIG//", 12, "INTERNAL",
-			1, "=ucs2reverse->INTERNAL",
+BUILTIN_TRANSFORMATION ("UNICODEBIG//", "INTERNAL", 1,
+			"=ucs2reverse->INTERNAL",
 			__gconv_transform_ucs2reverse_internal, NULL, NULL,
 			2, 2, 4, 4)
 
-BUILTIN_TRANSFORMATION (NULL, "INTERNAL", 8, "UNICODEBIG//",
-			1, "=INTERNAL->ucs2reverse",
+BUILTIN_TRANSFORMATION ("INTERNAL", "UNICODEBIG//", 1,
+			"=INTERNAL->ucs2reverse",
 			__gconv_transform_internal_ucs2reverse, NULL, NULL,
 			4, 4, 2, 2)
 #endif