From: K.Kosako Date: Thu, 28 Feb 2019 05:27:09 +0000 (+0900) Subject: remove tabs X-Git-Tag: v6.9.2_rc1~70 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f9127761d943f33b19e570f24ae80a362cb0282;p=onig remove tabs --- diff --git a/src/big5.c b/src/big5.c index f931ade..ff8bd3b 100644 --- a/src/big5.c +++ b/src/big5.c @@ -102,7 +102,7 @@ big5_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, #if 0 static int big5_is_mbc_ambiguous(OnigCaseFoldType flag, - const UChar** pp, const UChar* end) + const UChar** pp, const UChar* end) { return onigenc_mbn_is_mbc_ambiguous(ONIG_ENCODING_BIG5, flag, pp, end); } @@ -148,8 +148,8 @@ big5_left_adjust_char_head(const UChar* start, const UChar* s) if (BIG5_ISMB_TRAIL(*p)) { while (p > start) { if (! BIG5_ISMB_FIRST(*--p)) { - p++; - break; + p++; + break; } } } diff --git a/src/cp1251.c b/src/cp1251.c index 7b19855..b4ce4d8 100644 --- a/src/cp1251.c +++ b/src/cp1251.c @@ -164,7 +164,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int cp1251_apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, @@ -176,8 +176,8 @@ cp1251_get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_get_case_fold_codes_by_str_with_map( - sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, - flag, p, end, items); + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, + flag, p, end, items); } OnigEncodingType OnigEncodingCP1251 = { diff --git a/src/euc_jp.c b/src/euc_jp.c index c1ab89e..d17386d 100644 --- a/src/euc_jp.c +++ b/src/euc_jp.c @@ -157,7 +157,7 @@ code_to_mbc(OnigCodePoint code, UChar *buf) static int mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED, - const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) + const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) { int len; const UChar* p = *pp; @@ -269,7 +269,7 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype) static int get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out, - const OnigCodePoint* ranges[]) + const OnigCodePoint* ranges[]) { if (ctype <= ONIGENC_MAX_STD_CTYPE) { return ONIG_NO_SUPPORT_CONFIG; diff --git a/src/euc_kr.c b/src/euc_kr.c index 9b62514..bb968b0 100644 --- a/src/euc_kr.c +++ b/src/euc_kr.c @@ -68,7 +68,7 @@ is_valid_mbc_string(const UChar* p, const UChar* end) p++; if (p >= end) return FALSE; if (*p < 0xa1 || *p == 0xff) - return FALSE; + return FALSE; p++; } else @@ -101,7 +101,7 @@ euckr_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, #if 0 static int euckr_is_mbc_ambiguous(OnigCaseFoldType flag, - const UChar** pp, const UChar* end) + const UChar** pp, const UChar* end) { return onigenc_mbn_is_mbc_ambiguous(ONIG_ENCODING_EUC_KR, flag, pp, end); } diff --git a/src/euc_tw.c b/src/euc_tw.c index 7683336..c9acaf1 100644 --- a/src/euc_tw.c +++ b/src/euc_tw.c @@ -63,27 +63,27 @@ is_valid_mbc_string(const UChar* p, const UChar* end) } else if (*p < 0xa1) { if (*p == 0x8e) { - p++; - if (p >= end) return FALSE; - if (*p < 0xa1 || *p > 0xb0) return FALSE; - p++; - if (p >= end) return FALSE; - if (*p < 0xa1 || *p == 0xff) - return FALSE; - p++; - if (p >= end) return FALSE; - if (*p < 0xa1 || *p == 0xff) - return FALSE; - p++; + p++; + if (p >= end) return FALSE; + if (*p < 0xa1 || *p > 0xb0) return FALSE; + p++; + if (p >= end) return FALSE; + if (*p < 0xa1 || *p == 0xff) + return FALSE; + p++; + if (p >= end) return FALSE; + if (*p < 0xa1 || *p == 0xff) + return FALSE; + p++; } else - return FALSE; + return FALSE; } else if (*p < 0xff) { p++; if (p >= end) return FALSE; if (*p < 0xa1 || *p == 0xff) - return FALSE; + return FALSE; p++; } else diff --git a/src/iso8859_1.c b/src/iso8859_1.c index 0ce70a6..3b64942 100644 --- a/src/iso8859_1.c +++ b/src/iso8859_1.c @@ -103,7 +103,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, @@ -112,15 +112,15 @@ apply_all_case_fold(OnigCaseFoldType flag, static int get_case_fold_codes_by_str(OnigCaseFoldType flag ARG_UNUSED, - const OnigUChar* p, const OnigUChar* end, - OnigCaseFoldCodeItem items[]) + const OnigUChar* p, const OnigUChar* end, + OnigCaseFoldCodeItem items[]) { if (0x41 <= *p && *p <= 0x5a) { items[0].byte_len = 1; items[0].code_len = 1; items[0].code[0] = (OnigCodePoint )(*p + 0x20); if (*p == 0x53 && end > p + 1 - && (*(p+1) == 0x53 || *(p+1) == 0x73)) { /* SS */ + && (*(p+1) == 0x53 || *(p+1) == 0x73)) { /* SS */ items[1].byte_len = 2; items[1].code_len = 1; items[1].code[0] = (OnigCodePoint )0xdf; @@ -134,7 +134,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag ARG_UNUSED, items[0].code_len = 1; items[0].code[0] = (OnigCodePoint )(*p - 0x20); if (*p == 0x73 && end > p + 1 - && (*(p+1) == 0x73 || *(p+1) == 0x53)) { /* ss */ + && (*(p+1) == 0x73 || *(p+1) == 0x53)) { /* ss */ items[1].byte_len = 2; items[1].code_len = 1; items[1].code[0] = (OnigCodePoint )0xdf; @@ -200,7 +200,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag ARG_UNUSED, static int mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, - const UChar* end ARG_UNUSED, UChar* lower) + const UChar* end ARG_UNUSED, UChar* lower) { const UChar* p = *pp; @@ -218,8 +218,7 @@ mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, #if 0 static int -is_mbc_ambiguous(OnigCaseFoldType flag, - const UChar** pp, const UChar* end) +is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) { int v; const UChar* p = *pp; diff --git a/src/iso8859_10.c b/src/iso8859_10.c index 4a34b38..f5882bc 100644 --- a/src/iso8859_10.c +++ b/src/iso8859_10.c @@ -105,7 +105,7 @@ static const unsigned short EncISO_8859_10_CtypeTable[256] = { static int mbc_case_fold(OnigCaseFoldType flag, - const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) + const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) { const UChar* p = *pp; @@ -203,7 +203,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, @@ -215,8 +215,8 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_get_case_fold_codes_by_str_with_map( - sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, - flag, p, end, items); + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, + flag, p, end, items); } OnigEncodingType OnigEncodingISO_8859_10 = { diff --git a/src/iso8859_13.c b/src/iso8859_13.c index 23a0265..0cf251c 100644 --- a/src/iso8859_13.c +++ b/src/iso8859_13.c @@ -105,7 +105,7 @@ static const unsigned short EncISO_8859_13_CtypeTable[256] = { static int mbc_case_fold(OnigCaseFoldType flag, - const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) + const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) { const UChar* p = *pp; @@ -192,7 +192,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, @@ -204,8 +204,8 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_get_case_fold_codes_by_str_with_map( - sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, - flag, p, end, items); + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, + flag, p, end, items); } OnigEncodingType OnigEncodingISO_8859_13 = { diff --git a/src/iso8859_14.c b/src/iso8859_14.c index 7281e93..030e9f5 100644 --- a/src/iso8859_14.c +++ b/src/iso8859_14.c @@ -105,7 +105,7 @@ static const unsigned short EncISO_8859_14_CtypeTable[256] = { static int mbc_case_fold(OnigCaseFoldType flag, - const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) + const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) { const UChar* p = *pp; @@ -124,7 +124,7 @@ mbc_case_fold(OnigCaseFoldType flag, #if 0 static int is_mbc_ambiguous(OnigCaseFoldType flag, - const UChar** pp, const UChar* end) + const UChar** pp, const UChar* end) { int v; const UChar* p = *pp; @@ -205,7 +205,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, @@ -217,8 +217,8 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_get_case_fold_codes_by_str_with_map( - sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, - flag, p, end, items); + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, + flag, p, end, items); } OnigEncodingType OnigEncodingISO_8859_14 = { diff --git a/src/iso8859_15.c b/src/iso8859_15.c index 3d9f571..859d727 100644 --- a/src/iso8859_15.c +++ b/src/iso8859_15.c @@ -105,7 +105,7 @@ static const unsigned short EncISO_8859_15_CtypeTable[256] = { static int mbc_case_fold(OnigCaseFoldType flag, - const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) + const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) { const UChar* p = *pp; @@ -123,8 +123,7 @@ mbc_case_fold(OnigCaseFoldType flag, #if 0 static int -is_mbc_ambiguous(OnigCaseFoldType flag, - const UChar** pp, const UChar* end) +is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) { int v; const UChar* p = *pp; @@ -199,7 +198,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, @@ -211,8 +210,8 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_get_case_fold_codes_by_str_with_map( - sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, - flag, p, end, items); + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, + flag, p, end, items); } OnigEncodingType OnigEncodingISO_8859_15 = { diff --git a/src/iso8859_16.c b/src/iso8859_16.c index a6977dd..2614e56 100644 --- a/src/iso8859_16.c +++ b/src/iso8859_16.c @@ -105,7 +105,7 @@ static const unsigned short EncISO_8859_16_CtypeTable[256] = { static int mbc_case_fold(OnigCaseFoldType flag, - const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) + const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) { const UChar* p = *pp; @@ -201,7 +201,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, @@ -213,8 +213,8 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_get_case_fold_codes_by_str_with_map( - sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, - flag, p, end, items); + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, + flag, p, end, items); } OnigEncodingType OnigEncodingISO_8859_16 = { diff --git a/src/iso8859_2.c b/src/iso8859_2.c index 4f994c4..ba030d5 100644 --- a/src/iso8859_2.c +++ b/src/iso8859_2.c @@ -105,7 +105,7 @@ static const unsigned short EncISO_8859_2_CtypeTable[256] = { static int mbc_case_fold(OnigCaseFoldType flag, - const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) + const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) { const UChar* p = *pp; @@ -190,7 +190,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, @@ -202,8 +202,8 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_get_case_fold_codes_by_str_with_map( - sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, - flag, p, end, items); + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, + flag, p, end, items); } static int diff --git a/src/iso8859_3.c b/src/iso8859_3.c index 944a7ae..f090d0b 100644 --- a/src/iso8859_3.c +++ b/src/iso8859_3.c @@ -105,7 +105,7 @@ static const unsigned short EncISO_8859_3_CtypeTable[256] = { static int mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, - const UChar* end ARG_UNUSED, UChar* lower) + const UChar* end ARG_UNUSED, UChar* lower) { const UChar* p = *pp; @@ -199,7 +199,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, @@ -211,8 +211,8 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_get_case_fold_codes_by_str_with_map( - sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, - flag, p, end, items); + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, + flag, p, end, items); } OnigEncodingType OnigEncodingISO_8859_3 = { diff --git a/src/iso8859_4.c b/src/iso8859_4.c index 3a7c210..57dc9fe 100644 --- a/src/iso8859_4.c +++ b/src/iso8859_4.c @@ -105,7 +105,7 @@ static const unsigned short EncISO_8859_4_CtypeTable[256] = { static int mbc_case_fold(OnigCaseFoldType flag, - const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) + const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) { const UChar* p = *pp; @@ -201,7 +201,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, @@ -213,8 +213,8 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_get_case_fold_codes_by_str_with_map( - sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, - flag, p, end, items); + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, + flag, p, end, items); } OnigEncodingType OnigEncodingISO_8859_4 = { diff --git a/src/iso8859_5.c b/src/iso8859_5.c index 0a8b7ec..a090d25 100644 --- a/src/iso8859_5.c +++ b/src/iso8859_5.c @@ -105,7 +105,7 @@ static const unsigned short EncISO_8859_5_CtypeTable[256] = { static int mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED, - const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) + const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) { const UChar* p = *pp; @@ -189,7 +189,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, @@ -198,12 +198,12 @@ apply_all_case_fold(OnigCaseFoldType flag, static int get_case_fold_codes_by_str(OnigCaseFoldType flag, - const OnigUChar* p, const OnigUChar* end, - OnigCaseFoldCodeItem items[]) + const OnigUChar* p, const OnigUChar* end, + OnigCaseFoldCodeItem items[]) { return onigenc_get_case_fold_codes_by_str_with_map( - sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, - flag, p, end, items); + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, + flag, p, end, items); } OnigEncodingType OnigEncodingISO_8859_5 = { diff --git a/src/iso8859_7.c b/src/iso8859_7.c index 0877b6f..8c88351 100644 --- a/src/iso8859_7.c +++ b/src/iso8859_7.c @@ -105,7 +105,7 @@ static const unsigned short EncISO_8859_7_CtypeTable[256] = { static int mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED, - const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) + const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) { const UChar* p = *pp; @@ -116,8 +116,7 @@ mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED, #if 0 static int -is_mbc_ambiguous(OnigCaseFoldType flag, - const UChar** pp, const UChar* end) +is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) { int v; const UChar* p = *pp; @@ -185,7 +184,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, @@ -197,8 +196,8 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_get_case_fold_codes_by_str_with_map( - sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, - flag, p, end, items); + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, + flag, p, end, items); } diff --git a/src/iso8859_9.c b/src/iso8859_9.c index 8819f4a..1d291d5 100644 --- a/src/iso8859_9.c +++ b/src/iso8859_9.c @@ -105,7 +105,7 @@ static const unsigned short EncISO_8859_9_CtypeTable[256] = { static int mbc_case_fold(OnigCaseFoldType flag, - const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) + const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) { const UChar* p = *pp; @@ -192,7 +192,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, @@ -204,8 +204,8 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_get_case_fold_codes_by_str_with_map( - sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, - flag, p, end, items); + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1, + flag, p, end, items); } OnigEncodingType OnigEncodingISO_8859_9 = { diff --git a/src/koi8.c b/src/koi8.c index 7ce965f..94c95a0 100644 --- a/src/koi8.c +++ b/src/koi8.c @@ -106,7 +106,7 @@ static const unsigned short EncKOI8_CtypeTable[256] = { static int koi8_mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED, - const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) + const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) { const UChar* p = *pp; @@ -214,7 +214,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int koi8_apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, @@ -226,8 +226,8 @@ koi8_get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_get_case_fold_codes_by_str_with_map( - sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, - flag, p, end, items); + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, + flag, p, end, items); } OnigEncodingType OnigEncodingKOI8 = { diff --git a/src/koi8_r.c b/src/koi8_r.c index 5994ebe..1284f7f 100644 --- a/src/koi8_r.c +++ b/src/koi8_r.c @@ -176,7 +176,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int koi8_r_apply_all_case_fold(OnigCaseFoldType flag, - OnigApplyAllCaseFoldFunc f, void* arg) + OnigApplyAllCaseFoldFunc f, void* arg) { return onigenc_apply_all_case_fold_with_map( sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, @@ -188,8 +188,8 @@ koi8_r_get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_get_case_fold_codes_by_str_with_map( - sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, - flag, p, end, items); + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, + flag, p, end, items); } OnigEncodingType OnigEncodingKOI8_R = { diff --git a/src/sjis.c b/src/sjis.c index aaf4cb8..4f90b72 100644 --- a/src/sjis.c +++ b/src/sjis.c @@ -85,11 +85,11 @@ is_valid_mbc_string(const UChar* p, const UChar* end) } else if (*p < 0xa1) { if (*p == 0xa0 || *p == 0x80) - return FALSE; + return FALSE; p++; if (p >= end) return FALSE; if (*p < 0x40 || *p > 0xfc || *p == 0x7f) - return FALSE; + return FALSE; p++; } else if (*p < 0xe0) { @@ -99,7 +99,7 @@ is_valid_mbc_string(const UChar* p, const UChar* end) p++; if (p >= end) return FALSE; if (*p < 0x40 || *p > 0xfc || *p == 0x7f) - return FALSE; + return FALSE; p++; } else @@ -158,7 +158,7 @@ code_to_mbc(OnigCodePoint code, UChar *buf) static int mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED, - const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) + const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower) { const UChar* p = *pp; @@ -181,8 +181,7 @@ mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED, #if 0 static int -is_mbc_ambiguous(OnigCaseFoldType flag, - const UChar** pp, const UChar* end) +is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) { return onigenc_mbn_is_mbc_ambiguous(ONIG_ENCODING_SJIS, flag, pp, end); @@ -217,8 +216,8 @@ left_adjust_char_head(const UChar* start, const UChar* s) if (SJIS_ISMB_TRAIL(*p)) { while (p > start) { if (! SJIS_ISMB_FIRST(*--p)) { - p++; - break; + p++; + break; } } } @@ -281,7 +280,7 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype) return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype); else { if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) { - return (code_to_mbclen(code) > 1 ? TRUE : FALSE); + return (code_to_mbclen(code) > 1 ? TRUE : FALSE); } } } @@ -298,7 +297,7 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype) static int get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out, - const OnigCodePoint* ranges[]) + const OnigCodePoint* ranges[]) { if (ctype <= ONIGENC_MAX_STD_CTYPE) { return ONIG_NO_SUPPORT_CONFIG; diff --git a/src/utf16_be.c b/src/utf16_be.c index a812a32..22bf74d 100644 --- a/src/utf16_be.c +++ b/src/utf16_be.c @@ -174,7 +174,7 @@ utf16be_code_to_mbc(OnigCodePoint code, UChar *buf) static int utf16be_mbc_case_fold(OnigCaseFoldType flag, - const UChar** pp, const UChar* end, UChar* fold) + const UChar** pp, const UChar* end, UChar* fold) { const UChar* p = *pp; @@ -198,7 +198,7 @@ utf16be_mbc_case_fold(OnigCaseFoldType flag, } else return onigenc_unicode_mbc_case_fold(ONIG_ENCODING_UTF16_BE, flag, - pp, end, fold); + pp, end, fold); } #if 0 @@ -218,8 +218,7 @@ utf16be_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* e } c = *p; - v = ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(c, - (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER)); + v = ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(c, (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER)); if ((v | BIT_CTYPE_LOWER) != 0) { /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */ @@ -255,7 +254,7 @@ utf16be_get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_unicode_get_case_fold_codes_by_str(ONIG_ENCODING_UTF16_BE, - flag, p, end, items); + flag, p, end, items); } OnigEncodingType OnigEncodingUTF16_BE = { diff --git a/src/utf16_le.c b/src/utf16_le.c index da9571f..4b231c6 100644 --- a/src/utf16_le.c +++ b/src/utf16_le.c @@ -184,7 +184,7 @@ utf16le_code_to_mbc(OnigCodePoint code, UChar *buf) static int utf16le_mbc_case_fold(OnigCaseFoldType flag, - const UChar** pp, const UChar* end, UChar* fold) + const UChar** pp, const UChar* end, UChar* fold) { const UChar* p = *pp; @@ -207,13 +207,13 @@ utf16le_mbc_case_fold(OnigCaseFoldType flag, } else return onigenc_unicode_mbc_case_fold(ONIG_ENCODING_UTF16_LE, flag, pp, end, - fold); + fold); } #if 0 static int utf16le_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, - const UChar* end) + const UChar* end) { const UChar* p = *pp; @@ -263,7 +263,7 @@ utf16le_get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_unicode_get_case_fold_codes_by_str(ONIG_ENCODING_UTF16_LE, - flag, p, end, items); + flag, p, end, items); } OnigEncodingType OnigEncodingUTF16_LE = { diff --git a/src/utf32_be.c b/src/utf32_be.c index 9339b15..dd17d3b 100644 --- a/src/utf32_be.c +++ b/src/utf32_be.c @@ -90,7 +90,7 @@ utf32be_code_to_mbc(OnigCodePoint code, UChar *buf) static int utf32be_mbc_case_fold(OnigCaseFoldType flag, - const UChar** pp, const UChar* end, UChar* fold) + const UChar** pp, const UChar* end, UChar* fold) { const UChar* p = *pp; @@ -116,7 +116,7 @@ utf32be_mbc_case_fold(OnigCaseFoldType flag, } else return onigenc_unicode_mbc_case_fold(ONIG_ENCODING_UTF32_BE, flag, pp, end, - fold); + fold); } #if 0 @@ -168,7 +168,7 @@ utf32be_get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_unicode_get_case_fold_codes_by_str(ONIG_ENCODING_UTF32_BE, - flag, p, end, items); + flag, p, end, items); } OnigEncodingType OnigEncodingUTF32_BE = { diff --git a/src/utf32_le.c b/src/utf32_le.c index 22e007c..d9fe3c6 100644 --- a/src/utf32_le.c +++ b/src/utf32_le.c @@ -90,7 +90,7 @@ utf32le_code_to_mbc(OnigCodePoint code, UChar *buf) static int utf32le_mbc_case_fold(OnigCaseFoldType flag, - const UChar** pp, const UChar* end, UChar* fold) + const UChar** pp, const UChar* end, UChar* fold) { const UChar* p = *pp; @@ -168,7 +168,7 @@ utf32le_get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_unicode_get_case_fold_codes_by_str(ONIG_ENCODING_UTF32_LE, - flag, p, end, items); + flag, p, end, items); } OnigEncodingType OnigEncodingUTF32_LE = { diff --git a/src/utf8.c b/src/utf8.c index 4d1f9ec..110906a 100644 --- a/src/utf8.c +++ b/src/utf8.c @@ -78,11 +78,11 @@ is_valid_mbc_string(const UChar* p, const UChar* end) len = mbc_enc_len(p++); if (len > 1) { for (i = 1; i < len; i++) { - if (p == end) - return FALSE; + if (p == end) + return FALSE; - if (! utf8_istail(*p++)) - return FALSE; + if (! utf8_istail(*p++)) + return FALSE; } } } @@ -222,7 +222,7 @@ code_to_mbc(OnigCodePoint code, UChar *buf) static int mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, - const UChar* end, UChar* fold) + const UChar* end, UChar* fold) { const UChar* p = *pp; @@ -244,13 +244,13 @@ mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, } else { return onigenc_unicode_mbc_case_fold(ONIG_ENCODING_UTF8, flag, - pp, end, fold); + pp, end, fold); } } static int get_ctype_code_range(OnigCtype ctype, OnigCodePoint *sb_out, - const OnigCodePoint* ranges[]) + const OnigCodePoint* ranges[]) { *sb_out = 0x80; return onigenc_unicode_ctype_code_range(ctype, ranges); @@ -274,7 +274,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[]) { return onigenc_unicode_get_case_fold_codes_by_str(ONIG_ENCODING_UTF8, - flag, p, end, items); + flag, p, end, items); } OnigEncodingType OnigEncodingUTF8 = {