From 1f11bdd87ac396cc552b975ec5c25f71851155f5 Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Fri, 19 Jan 2018 00:17:41 +0000 Subject: [PATCH] Use briefer form for setting up modules Use consistently everywhere possible. --- src/african.c | 32 ++++------- src/afrtran.c | 47 ++++++---------- src/dump.c | 144 ++++++++++++++++++++------------------------------ src/varia.c | 62 +++++++++------------- 4 files changed, 109 insertions(+), 176 deletions(-) diff --git a/src/african.c b/src/african.c index 3da0701..b26b9a9 100644 --- a/src/african.c +++ b/src/african.c @@ -108,28 +108,16 @@ static const unsigned short lin_data[] = bool module_african (RECODE_OUTER outer) { - if (!declare_explode_data (outer, ful_data, "AFRFUL-102-BPI_OCIL", NULL)) - return false; - if (!declare_alias (outer, "bambara", "AFRFUL-102-BPI_OCIL")) - return false; - if (!declare_alias (outer, "bra", "AFRFUL-102-BPI_OCIL")) - return false; - if (!declare_alias (outer, "ewondo", "AFRFUL-102-BPI_OCIL")) - return false; - if (!declare_alias (outer, "fulfulde", "AFRFUL-102-BPI_OCIL")) - return false; - if (!declare_explode_data (outer, lin_data, "AFRLIN-104-BPI_OCIL", NULL)) - return false; - if (!declare_alias (outer, "lingala", "AFRLIN-104-BPI_OCIL")) - return false; - if (!declare_alias (outer, "lin", "AFRLIN-104-BPI_OCIL")) - return false; - if (!declare_alias (outer, "sango", "AFRLIN-104-BPI_OCIL")) - return false; - if (!declare_alias (outer, "wolof", "AFRLIN-104-BPI_OCIL")) - return false; - - return true; + return declare_explode_data (outer, ful_data, "AFRFUL-102-BPI_OCIL", NULL) + && declare_alias (outer, "bambara", "AFRFUL-102-BPI_OCIL") + && declare_alias (outer, "bra", "AFRFUL-102-BPI_OCIL") + && declare_alias (outer, "ewondo", "AFRFUL-102-BPI_OCIL") + && declare_alias (outer, "fulfulde", "AFRFUL-102-BPI_OCIL") + && declare_explode_data (outer, lin_data, "AFRLIN-104-BPI_OCIL", NULL) + && declare_alias (outer, "lingala", "AFRLIN-104-BPI_OCIL") + && declare_alias (outer, "lin", "AFRLIN-104-BPI_OCIL") + && declare_alias (outer, "sango", "AFRLIN-104-BPI_OCIL") + && declare_alias (outer, "wolof", "AFRLIN-104-BPI_OCIL"); } _GL_ATTRIBUTE_CONST void diff --git a/src/afrtran.c b/src/afrtran.c index 8f13d29..c84e5fd 100644 --- a/src/afrtran.c +++ b/src/afrtran.c @@ -314,37 +314,22 @@ static const unsigned short lin_data[] = bool module_afrtran (RECODE_OUTER outer) { - if (!declare_explode_data (outer, ful_data, - "AFRFUL-102-BPI_OCIL", "AFRFUL-103-BPI_OCIL")) - return false; - if (!declare_alias (outer, "t-bambara", "AFRFUL-103-BPI_OCIL")) - return false; - if (!declare_alias (outer, "t-bra", "AFRFUL-103-BPI_OCIL")) - return false; - if (!declare_alias (outer, "t-ewondo", "AFRFUL-103-BPI_OCIL")) - return false; - if (!declare_alias (outer, "t-fulfulde", "AFRFUL-103-BPI_OCIL")) - return false; - if (!declare_explode_data (outer, l1_data, - "ISO-8859-1", "AFRL1-101-BPI_OCIL")) - return false; - if (!declare_alias (outer, "t-francais", "AFRL1-101-BPI_OCIL")) - return false; - if (!declare_alias (outer, "t-fra", "AFRL1-101-BPI_OCIL")) - return false; - if (!declare_explode_data (outer, lin_data, - "AFRLIN-104-BPI_OCIL", "AFRLIN-105-BPI_OCIL")) - return false; - if (!declare_alias (outer, "t-lingala", "AFRLIN-105-BPI_OCIL")) - return false; - if (!declare_alias (outer, "t-lin", "AFRLIN-105-BPI_OCIL")) - return false; - if (!declare_alias (outer, "t-sango", "AFRLIN-105-BPI_OCIL")) - return false; - if (!declare_alias (outer, "t-wolof", "AFRLIN-105-BPI_OCIL")) - return false; - - return true; + return declare_explode_data (outer, ful_data, + "AFRFUL-102-BPI_OCIL", "AFRFUL-103-BPI_OCIL") + && declare_alias (outer, "t-bambara", "AFRFUL-103-BPI_OCIL") + && declare_alias (outer, "t-bra", "AFRFUL-103-BPI_OCIL") + && declare_alias (outer, "t-ewondo", "AFRFUL-103-BPI_OCIL") + && declare_alias (outer, "t-fulfulde", "AFRFUL-103-BPI_OCIL") + && declare_explode_data (outer, l1_data, + "ISO-8859-1", "AFRL1-101-BPI_OCIL") + && declare_alias (outer, "t-francais", "AFRL1-101-BPI_OCIL") + && declare_alias (outer, "t-fra", "AFRL1-101-BPI_OCIL") + && declare_explode_data (outer, lin_data, + "AFRLIN-104-BPI_OCIL", "AFRLIN-105-BPI_OCIL") + && declare_alias (outer, "t-lingala", "AFRLIN-105-BPI_OCIL") + && declare_alias (outer, "t-lin", "AFRLIN-105-BPI_OCIL") + && declare_alias (outer, "t-sango", "AFRLIN-105-BPI_OCIL") + && declare_alias (outer, "t-wolof", "AFRLIN-105-BPI_OCIL"); } _GL_ATTRIBUTE_CONST void diff --git a/src/dump.c b/src/dump.c index 956ec80..8cca644 100644 --- a/src/dump.c +++ b/src/dump.c @@ -351,115 +351,87 @@ TRANSFORM (hex4_data, undump, HEXADECIMAL, 4) bool module_dump (RECODE_OUTER outer) { + return + /* Single bytes. */ - if (!declare_single (outer, "data", "Octal-1", - outer->quality_variable_to_variable, - NULL, data_oct1)) - return false; - if (!declare_single (outer, "data", "Decimal-1", - outer->quality_variable_to_variable, - NULL, data_dec1)) - return false; - if (!declare_single (outer, "data", "Hexadecimal-1", - outer->quality_variable_to_variable, - NULL, data_hex1)) - return false; - if (!declare_single (outer, "Octal-1", "data", - outer->quality_variable_to_variable, - NULL, oct1_data)) - return false; - if (!declare_single (outer, "Decimal-1", "data", - outer->quality_variable_to_variable, - NULL, dec1_data)) - return false; - if (!declare_single (outer, "Hexadecimal-1", "data", - outer->quality_variable_to_variable, - NULL, hex1_data)) - return false; - - if (!declare_alias (outer, "o1", "Octal-1")) - return false; - if (!declare_alias (outer, "d1", "Decimal-1")) - return false; - if (!declare_alias (outer, "x1", "Hexadecimal-1")) - return false; - if (!declare_alias (outer, "o", "Octal-1")) - return false; - if (!declare_alias (outer, "d", "Decimal-1")) - return false; - if (!declare_alias (outer, "x", "Hexadecimal-1")) - return false; + declare_single (outer, "data", "Octal-1", + outer->quality_variable_to_variable, + NULL, data_oct1) + && declare_single (outer, "data", "Decimal-1", + outer->quality_variable_to_variable, + NULL, data_dec1) + && declare_single (outer, "data", "Hexadecimal-1", + outer->quality_variable_to_variable, + NULL, data_hex1) + && declare_single (outer, "Octal-1", "data", + outer->quality_variable_to_variable, + NULL, oct1_data) + && declare_single (outer, "Decimal-1", "data", + outer->quality_variable_to_variable, + NULL, dec1_data) + && declare_single (outer, "Hexadecimal-1", "data", + outer->quality_variable_to_variable, + NULL, hex1_data) + + && declare_alias (outer, "o1", "Octal-1") + && declare_alias (outer, "d1", "Decimal-1") + && declare_alias (outer, "x1", "Hexadecimal-1") + && declare_alias (outer, "o", "Octal-1") + && declare_alias (outer, "d", "Decimal-1") + && declare_alias (outer, "x", "Hexadecimal-1") /* Double bytes. */ - if (!declare_single (outer, "data", "Octal-2", + && declare_single (outer, "data", "Octal-2", outer->quality_variable_to_variable, - NULL, data_oct2)) - return false; - if (!declare_single (outer, "data", "Decimal-2", + NULL, data_oct2) + && declare_single (outer, "data", "Decimal-2", outer->quality_variable_to_variable, - NULL, data_dec2)) - return false; - if (!declare_single (outer, "data", "Hexadecimal-2", + NULL, data_dec2) + && declare_single (outer, "data", "Hexadecimal-2", outer->quality_variable_to_variable, - NULL, data_hex2)) - return false; - if (!declare_single (outer, "Octal-2", "data", + NULL, data_hex2) + && declare_single (outer, "Octal-2", "data", outer->quality_variable_to_variable, - NULL, oct2_data)) - return false; - if (!declare_single (outer, "Decimal-2", "data", + NULL, oct2_data) + && declare_single (outer, "Decimal-2", "data", outer->quality_variable_to_variable, - NULL, dec2_data)) - return false; - if (!declare_single (outer, "Hexadecimal-2", "data", + NULL, dec2_data) + && declare_single (outer, "Hexadecimal-2", "data", outer->quality_variable_to_variable, - NULL, hex2_data)) - return false; + NULL, hex2_data) - if (!declare_alias (outer, "o2", "Octal-2")) - return false; - if (!declare_alias (outer, "d2", "Decimal-2")) - return false; - if (!declare_alias (outer, "x2", "Hexadecimal-2")) - return false; + && declare_alias (outer, "o2", "Octal-2") + && declare_alias (outer, "d2", "Decimal-2") + && declare_alias (outer, "x2", "Hexadecimal-2") /* Quadruple bytes. */ - if (!declare_single (outer, "data", "Octal-4", + && declare_single (outer, "data", "Octal-4", outer->quality_variable_to_variable, - NULL, data_oct4)) - return false; - if (!declare_single (outer, "data", "Decimal-4", + NULL, data_oct4) + && declare_single (outer, "data", "Decimal-4", outer->quality_variable_to_variable, - NULL, data_dec4)) - return false; - if (!declare_single (outer, "data", "Hexadecimal-4", + NULL, data_dec4) + && declare_single (outer, "data", "Hexadecimal-4", outer->quality_variable_to_variable, - NULL, data_hex4)) - return false; - if (!declare_single (outer, "Octal-4", "data", + NULL, data_hex4) + && declare_single (outer, "Octal-4", "data", outer->quality_variable_to_variable, - NULL, oct4_data)) - return false; - if (!declare_single (outer, "Decimal-4", "data", + NULL, oct4_data) + && declare_single (outer, "Decimal-4", "data", outer->quality_variable_to_variable, - NULL, dec4_data)) - return false; - if (!declare_single (outer, "Hexadecimal-4", "data", + NULL, dec4_data) + && declare_single (outer, "Hexadecimal-4", "data", outer->quality_variable_to_variable, - NULL, hex4_data)) - return false; + NULL, hex4_data) - if (!declare_alias (outer, "o4", "Octal-4")) - return false; - if (!declare_alias (outer, "d4", "Decimal-4")) - return false; - if (!declare_alias (outer, "x4", "Hexadecimal-4")) - return false; + && declare_alias (outer, "o4", "Octal-4") + && declare_alias (outer, "d4", "Decimal-4") + && declare_alias (outer, "x4", "Hexadecimal-4") - return true; + ; } _GL_ATTRIBUTE_CONST void diff --git a/src/varia.c b/src/varia.c index 251f541..c653a57 100644 --- a/src/varia.c +++ b/src/varia.c @@ -484,50 +484,38 @@ static unsigned char const koi8r_to_iso8859_5[256-128] = bool module_varia (RECODE_OUTER outer) { + return + /* Czech tables. */ - if (!declare_explode_data (outer, data_kamenicky, "KEYBCS2", NULL)) - return false; - if (!declare_explode_data (outer, data_cork, "CORK", NULL)) - return false; - if (!declare_explode_data (outer, data_koi8cs2, "KOI-8_CS2", NULL)) - return false; + declare_explode_data (outer, data_kamenicky, "KEYBCS2", NULL) + && declare_explode_data (outer, data_cork, "CORK", NULL) + && declare_explode_data (outer, data_koi8cs2, "KOI-8_CS2", NULL) - if (!declare_alias (outer, "Kamenicky", "KEYBCS2")) - return false; - if (!declare_alias (outer, "T1", "CORK")) - return false; + && declare_alias (outer, "Kamenicky", "KEYBCS2") + && declare_alias (outer, "T1", "CORK") #if NOT_ACTIVE_YET - return - && declare_single(outer, "KOI8-R", "IBM866", - outer->quality_byte_reversible, - NULL, transform_byte_to_byte); - - /* Suggested by Alexander L. Belikoff. */ - if (!declare_alias("866", "IBM866")) - return false; - if (!declare_alias("CP866", "IBM866")) - return false; - if (!declare_alias("alt", "IBM866")) - return false; - - /* Suggested by Alexander L. Belikoff. */ - if (!declare_alias ("1489", "KOI8-R")) - return false; - if (!declare_alias ("RFC1489", "KOI8-R")) - return false; - - /* Suggested by Alexander L. Belikoff. */ - if (!declare_alias ("878", "KOI8-R")) - return false; - if (!declare_alias ("CP878", "KOI8-R")) - return false; - if (!declare_alias ("IBM878", "KOI8-R");) - return false; + && declare_single (outer, "KOI8-R", "IBM866", + outer->quality_byte_reversible, + NULL, transform_byte_to_byte); + + /* Suggested by Alexander L. Belikoff. */ + && declare_alias("866", "IBM866") + && declare_alias("CP866", "IBM866") + && declare_alias("alt", "IBM866") + + /* Suggested by Alexander L. Belikoff. */ + && declare_alias ("1489", "KOI8-R") + && declare_alias ("RFC1489", "KOI8-R") + + /* Suggested by Alexander L. Belikoff. */ + && declare_alias ("878", "KOI8-R") + && declare_alias ("CP878", "KOI8-R") + && declare_alias ("IBM878", "KOI8-R") #endif - return true; + ; } _GL_ATTRIBUTE_CONST void -- 2.40.0