diff options
| author | Dmitry Antipov | 2014-07-10 08:35:55 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2014-07-10 08:35:55 +0400 |
| commit | 80fb41cd90467782f4cfb21074aaa4f95308985e (patch) | |
| tree | 00ffd4871657cc09edb7d61e6de233d753c1b7d5 /src/coding.c | |
| parent | 09880d8533e588da3388263f8c2360eb28ccc878 (diff) | |
| download | emacs-80fb41cd90467782f4cfb21074aaa4f95308985e.tar.gz emacs-80fb41cd90467782f4cfb21074aaa4f95308985e.zip | |
* coding.h (struct coding_system): Remove 'error_positions' (unused)
and 'errors' (set but unused) fields. Use bitfields for 'eol_seen',
'mode', 'common_flags' and 'result' fields, adjust layout to avoid
extra padding and shrink struct coding_system by 56 bytes (x86_64).
* coding.c (decode_coding_utf_8, decode_coding_utf_16)
(decode_coding_emacs_mule, decode_coding_iso_2022, decode_coding_sjis)
(decode_coding_big5, decode_coding_charset, decode_coding)
(encode_coding): Adjust users.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/coding.c b/src/coding.c index 5e7a676aecd..523a6bf0f27 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -1486,7 +1486,6 @@ decode_coding_utf_8 (struct coding_system *coding) | |||
| 1486 | consumed_chars = consumed_chars_base; | 1486 | consumed_chars = consumed_chars_base; |
| 1487 | ONE_MORE_BYTE (c); | 1487 | ONE_MORE_BYTE (c); |
| 1488 | *charbuf++ = ASCII_CHAR_P (c) ? c : BYTE8_TO_CHAR (c); | 1488 | *charbuf++ = ASCII_CHAR_P (c) ? c : BYTE8_TO_CHAR (c); |
| 1489 | coding->errors++; | ||
| 1490 | } | 1489 | } |
| 1491 | 1490 | ||
| 1492 | no_more_source: | 1491 | no_more_source: |
| @@ -1685,7 +1684,6 @@ decode_coding_utf_16 (struct coding_system *coding) | |||
| 1685 | /* The first two bytes are not BOM. Treat them as bytes | 1684 | /* The first two bytes are not BOM. Treat them as bytes |
| 1686 | for a normal character. */ | 1685 | for a normal character. */ |
| 1687 | src = src_base; | 1686 | src = src_base; |
| 1688 | coding->errors++; | ||
| 1689 | } | 1687 | } |
| 1690 | CODING_UTF_16_BOM (coding) = utf_without_bom; | 1688 | CODING_UTF_16_BOM (coding) = utf_without_bom; |
| 1691 | } | 1689 | } |
| @@ -1742,7 +1740,6 @@ decode_coding_utf_16 (struct coding_system *coding) | |||
| 1742 | c1 = surrogate & 0xFF, c2 = surrogate >> 8; | 1740 | c1 = surrogate & 0xFF, c2 = surrogate >> 8; |
| 1743 | *charbuf++ = c1; | 1741 | *charbuf++ = c1; |
| 1744 | *charbuf++ = c2; | 1742 | *charbuf++ = c2; |
| 1745 | coding->errors++; | ||
| 1746 | if (UTF_16_HIGH_SURROGATE_P (c)) | 1743 | if (UTF_16_HIGH_SURROGATE_P (c)) |
| 1747 | CODING_UTF_16_SURROGATE (coding) = surrogate = c; | 1744 | CODING_UTF_16_SURROGATE (coding) = surrogate = c; |
| 1748 | else | 1745 | else |
| @@ -2598,7 +2595,6 @@ decode_coding_emacs_mule (struct coding_system *coding) | |||
| 2598 | ONE_MORE_BYTE (c); | 2595 | ONE_MORE_BYTE (c); |
| 2599 | *charbuf++ = ASCII_CHAR_P (c) ? c : BYTE8_TO_CHAR (c); | 2596 | *charbuf++ = ASCII_CHAR_P (c) ? c : BYTE8_TO_CHAR (c); |
| 2600 | char_offset++; | 2597 | char_offset++; |
| 2601 | coding->errors++; | ||
| 2602 | } | 2598 | } |
| 2603 | 2599 | ||
| 2604 | no_more_source: | 2600 | no_more_source: |
| @@ -4006,7 +4002,6 @@ decode_coding_iso_2022 (struct coding_system *coding) | |||
| 4006 | ONE_MORE_BYTE (c); | 4002 | ONE_MORE_BYTE (c); |
| 4007 | *charbuf++ = c < 0 ? -c : ASCII_CHAR_P (c) ? c : BYTE8_TO_CHAR (c); | 4003 | *charbuf++ = c < 0 ? -c : ASCII_CHAR_P (c) ? c : BYTE8_TO_CHAR (c); |
| 4008 | char_offset++; | 4004 | char_offset++; |
| 4009 | coding->errors++; | ||
| 4010 | /* Reset the invocation and designation status to the safest | 4005 | /* Reset the invocation and designation status to the safest |
| 4011 | one; i.e. designate ASCII to the graphic register 0, and | 4006 | one; i.e. designate ASCII to the graphic register 0, and |
| 4012 | invoke that register to the graphic plane 0. This typically | 4007 | invoke that register to the graphic plane 0. This typically |
| @@ -4837,7 +4832,6 @@ decode_coding_sjis (struct coding_system *coding) | |||
| 4837 | ONE_MORE_BYTE (c); | 4832 | ONE_MORE_BYTE (c); |
| 4838 | *charbuf++ = c < 0 ? -c : BYTE8_TO_CHAR (c); | 4833 | *charbuf++ = c < 0 ? -c : BYTE8_TO_CHAR (c); |
| 4839 | char_offset++; | 4834 | char_offset++; |
| 4840 | coding->errors++; | ||
| 4841 | } | 4835 | } |
| 4842 | 4836 | ||
| 4843 | no_more_source: | 4837 | no_more_source: |
| @@ -4933,7 +4927,6 @@ decode_coding_big5 (struct coding_system *coding) | |||
| 4933 | ONE_MORE_BYTE (c); | 4927 | ONE_MORE_BYTE (c); |
| 4934 | *charbuf++ = c < 0 ? -c : BYTE8_TO_CHAR (c); | 4928 | *charbuf++ = c < 0 ? -c : BYTE8_TO_CHAR (c); |
| 4935 | char_offset++; | 4929 | char_offset++; |
| 4936 | coding->errors++; | ||
| 4937 | } | 4930 | } |
| 4938 | 4931 | ||
| 4939 | no_more_source: | 4932 | no_more_source: |
| @@ -5642,7 +5635,6 @@ decode_coding_charset (struct coding_system *coding) | |||
| 5642 | ONE_MORE_BYTE (c); | 5635 | ONE_MORE_BYTE (c); |
| 5643 | *charbuf++ = c < 0 ? -c : ASCII_CHAR_P (c) ? c : BYTE8_TO_CHAR (c); | 5636 | *charbuf++ = c < 0 ? -c : ASCII_CHAR_P (c) ? c : BYTE8_TO_CHAR (c); |
| 5644 | char_offset++; | 5637 | char_offset++; |
| 5645 | coding->errors++; | ||
| 5646 | } | 5638 | } |
| 5647 | 5639 | ||
| 5648 | no_more_source: | 5640 | no_more_source: |
| @@ -7375,7 +7367,6 @@ decode_coding (struct coding_system *coding) | |||
| 7375 | coding->produced = coding->produced_char = 0; | 7367 | coding->produced = coding->produced_char = 0; |
| 7376 | coding->chars_at_source = 0; | 7368 | coding->chars_at_source = 0; |
| 7377 | record_conversion_result (coding, CODING_RESULT_SUCCESS); | 7369 | record_conversion_result (coding, CODING_RESULT_SUCCESS); |
| 7378 | coding->errors = 0; | ||
| 7379 | 7370 | ||
| 7380 | ALLOC_CONVERSION_WORK_AREA (coding, coding->src_bytes); | 7371 | ALLOC_CONVERSION_WORK_AREA (coding, coding->src_bytes); |
| 7381 | 7372 | ||
| @@ -7771,7 +7762,6 @@ encode_coding (struct coding_system *coding) | |||
| 7771 | coding->consumed = coding->consumed_char = 0; | 7762 | coding->consumed = coding->consumed_char = 0; |
| 7772 | coding->produced = coding->produced_char = 0; | 7763 | coding->produced = coding->produced_char = 0; |
| 7773 | record_conversion_result (coding, CODING_RESULT_SUCCESS); | 7764 | record_conversion_result (coding, CODING_RESULT_SUCCESS); |
| 7774 | coding->errors = 0; | ||
| 7775 | 7765 | ||
| 7776 | ALLOC_CONVERSION_WORK_AREA (coding, coding->src_chars); | 7766 | ALLOC_CONVERSION_WORK_AREA (coding, coding->src_chars); |
| 7777 | 7767 | ||