diff options
| author | Paul Eggert | 2016-06-08 10:33:34 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-06-08 11:50:42 -0700 |
| commit | 82f49c6a373f981a778f4d939ca2d47c031e0659 (patch) | |
| tree | e84afa8e7af336f15f37789fbf23f4ec62905790 /src/coding.c | |
| parent | 7715ee54b3588cfdef03b5d45aaf44b73b422ec6 (diff) | |
| download | emacs-82f49c6a373f981a778f4d939ca2d47c031e0659.tar.gz emacs-82f49c6a373f981a778f4d939ca2d47c031e0659.zip | |
Replace IF_LINT by NONVOLATILE and UNINIT
Inspired by a suggestion from RMS in: http://bugs.gnu.org/23640#58
* .dir-locals.el (c-mode): Adjust to macro changes.
* src/conf_post.h (NONVOLATILE, UNINIT): New macros (Bug#23640).
(IF_LINT): Remove. All uses replaced by the new macros.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/coding.c b/src/coding.c index a28fec1efe4..3f7d11151d4 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -2365,7 +2365,8 @@ decode_coding_emacs_mule (struct coding_system *coding) | |||
| 2365 | 2365 | ||
| 2366 | while (1) | 2366 | while (1) |
| 2367 | { | 2367 | { |
| 2368 | int c, id IF_LINT (= 0); | 2368 | int c; |
| 2369 | int id UNINIT; | ||
| 2369 | 2370 | ||
| 2370 | src_base = src; | 2371 | src_base = src; |
| 2371 | consumed_chars_base = consumed_chars; | 2372 | consumed_chars_base = consumed_chars; |
| @@ -2410,7 +2411,7 @@ decode_coding_emacs_mule (struct coding_system *coding) | |||
| 2410 | } | 2411 | } |
| 2411 | else | 2412 | else |
| 2412 | { | 2413 | { |
| 2413 | int nchars IF_LINT (= 0), nbytes IF_LINT (= 0); | 2414 | int nchars UNINIT, nbytes UNINIT; |
| 2414 | /* emacs_mule_char can load a charset map from a file, which | 2415 | /* emacs_mule_char can load a charset map from a file, which |
| 2415 | allocates a large structure and might cause buffer text | 2416 | allocates a large structure and might cause buffer text |
| 2416 | to be relocated as result. Thus, we need to remember the | 2417 | to be relocated as result. Thus, we need to remember the |
| @@ -8565,8 +8566,8 @@ detect_coding_system (const unsigned char *src, | |||
| 8565 | base_category = XINT (CODING_ATTR_CATEGORY (attrs)); | 8566 | base_category = XINT (CODING_ATTR_CATEGORY (attrs)); |
| 8566 | if (base_category == coding_category_undecided) | 8567 | if (base_category == coding_category_undecided) |
| 8567 | { | 8568 | { |
| 8568 | enum coding_category category IF_LINT (= 0); | 8569 | enum coding_category category UNINIT; |
| 8569 | struct coding_system *this IF_LINT (= NULL); | 8570 | struct coding_system *this UNINIT; |
| 8570 | int c, i; | 8571 | int c, i; |
| 8571 | bool inhibit_nbd = inhibit_flag (coding.spec.undecided.inhibit_nbd, | 8572 | bool inhibit_nbd = inhibit_flag (coding.spec.undecided.inhibit_nbd, |
| 8572 | inhibit_null_byte_detection); | 8573 | inhibit_null_byte_detection); |