diff options
| author | Pavel Janík | 2001-11-02 20:46:55 +0000 |
|---|---|---|
| committer | Pavel Janík | 2001-11-02 20:46:55 +0000 |
| commit | b78265036088d5d0eac2a03b929adb50aa59b45c (patch) | |
| tree | de99fe733144deb926fd31ee7bdff95cb1bc5073 /src/coding.c | |
| parent | 00a2cef7d11a1b193891eb3d28274ef7fc7c3fe4 (diff) | |
| download | emacs-b78265036088d5d0eac2a03b929adb50aa59b45c.tar.gz emacs-b78265036088d5d0eac2a03b929adb50aa59b45c.zip | |
Update usage of CHECK_ macros (remove unused second argument).
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/coding.c b/src/coding.c index 78ba80c35ee..e94a65006cc 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -5741,7 +5741,7 @@ code_convert_region (from, from_byte, to, to_byte, coding, encodep, replace) | |||
| 5741 | inhibit_pre_post_conversion = 0; | 5741 | inhibit_pre_post_conversion = 0; |
| 5742 | /* Discard the unwind protect. */ | 5742 | /* Discard the unwind protect. */ |
| 5743 | specpdl_ptr--; | 5743 | specpdl_ptr--; |
| 5744 | CHECK_NUMBER (val, 0); | 5744 | CHECK_NUMBER (val); |
| 5745 | inserted += Z - prev_Z; | 5745 | inserted += Z - prev_Z; |
| 5746 | } | 5746 | } |
| 5747 | 5747 | ||
| @@ -6148,7 +6148,7 @@ The value of property should be a vector of length 5.") | |||
| 6148 | (coding_system) | 6148 | (coding_system) |
| 6149 | Lisp_Object coding_system; | 6149 | Lisp_Object coding_system; |
| 6150 | { | 6150 | { |
| 6151 | CHECK_SYMBOL (coding_system, 0); | 6151 | CHECK_SYMBOL (coding_system); |
| 6152 | if (!NILP (Fcoding_system_p (coding_system))) | 6152 | if (!NILP (Fcoding_system_p (coding_system))) |
| 6153 | return coding_system; | 6153 | return coding_system; |
| 6154 | while (1) | 6154 | while (1) |
| @@ -6236,8 +6236,8 @@ highest priority.") | |||
| 6236 | int from_byte, to_byte; | 6236 | int from_byte, to_byte; |
| 6237 | int include_anchor_byte = 0; | 6237 | int include_anchor_byte = 0; |
| 6238 | 6238 | ||
| 6239 | CHECK_NUMBER_COERCE_MARKER (start, 0); | 6239 | CHECK_NUMBER_COERCE_MARKER (start); |
| 6240 | CHECK_NUMBER_COERCE_MARKER (end, 1); | 6240 | CHECK_NUMBER_COERCE_MARKER (end); |
| 6241 | 6241 | ||
| 6242 | validate_region (&start, &end); | 6242 | validate_region (&start, &end); |
| 6243 | from = XINT (start), to = XINT (end); | 6243 | from = XINT (start), to = XINT (end); |
| @@ -6276,7 +6276,7 @@ highest priority.") | |||
| 6276 | (string, highest) | 6276 | (string, highest) |
| 6277 | Lisp_Object string, highest; | 6277 | Lisp_Object string, highest; |
| 6278 | { | 6278 | { |
| 6279 | CHECK_STRING (string, 0); | 6279 | CHECK_STRING (string); |
| 6280 | 6280 | ||
| 6281 | return detect_coding_system (XSTRING (string)->data, | 6281 | return detect_coding_system (XSTRING (string)->data, |
| 6282 | /* "+ 1" is to include the anchor byte | 6282 | /* "+ 1" is to include the anchor byte |
| @@ -6386,8 +6386,8 @@ DEFUN ("find-coding-systems-region-internal", | |||
| 6386 | { | 6386 | { |
| 6387 | int from, to, stop; | 6387 | int from, to, stop; |
| 6388 | 6388 | ||
| 6389 | CHECK_NUMBER_COERCE_MARKER (start, 0); | 6389 | CHECK_NUMBER_COERCE_MARKER (start); |
| 6390 | CHECK_NUMBER_COERCE_MARKER (end, 1); | 6390 | CHECK_NUMBER_COERCE_MARKER (end); |
| 6391 | if (XINT (start) < BEG || XINT (end) > Z || XINT (start) > XINT (end)) | 6391 | if (XINT (start) < BEG || XINT (end) > Z || XINT (start) > XINT (end)) |
| 6392 | args_out_of_range (start, end); | 6392 | args_out_of_range (start, end); |
| 6393 | if (NILP (current_buffer->enable_multibyte_characters)) | 6393 | if (NILP (current_buffer->enable_multibyte_characters)) |
| @@ -6453,9 +6453,9 @@ code_convert_region1 (start, end, coding_system, encodep) | |||
| 6453 | struct coding_system coding; | 6453 | struct coding_system coding; |
| 6454 | int from, to; | 6454 | int from, to; |
| 6455 | 6455 | ||
| 6456 | CHECK_NUMBER_COERCE_MARKER (start, 0); | 6456 | CHECK_NUMBER_COERCE_MARKER (start); |
| 6457 | CHECK_NUMBER_COERCE_MARKER (end, 1); | 6457 | CHECK_NUMBER_COERCE_MARKER (end); |
| 6458 | CHECK_SYMBOL (coding_system, 2); | 6458 | CHECK_SYMBOL (coding_system); |
| 6459 | 6459 | ||
| 6460 | validate_region (&start, &end); | 6460 | validate_region (&start, &end); |
| 6461 | from = XFASTINT (start); | 6461 | from = XFASTINT (start); |
| @@ -6513,8 +6513,8 @@ code_convert_string1 (string, coding_system, nocopy, encodep) | |||
| 6513 | { | 6513 | { |
| 6514 | struct coding_system coding; | 6514 | struct coding_system coding; |
| 6515 | 6515 | ||
| 6516 | CHECK_STRING (string, 0); | 6516 | CHECK_STRING (string); |
| 6517 | CHECK_SYMBOL (coding_system, 1); | 6517 | CHECK_SYMBOL (coding_system); |
| 6518 | 6518 | ||
| 6519 | if (NILP (coding_system)) | 6519 | if (NILP (coding_system)) |
| 6520 | return (NILP (nocopy) ? Fcopy_sequence (string) : string); | 6520 | return (NILP (nocopy) ? Fcopy_sequence (string) : string); |
| @@ -6572,8 +6572,8 @@ code_convert_string_norecord (string, coding_system, encodep) | |||
| 6572 | { | 6572 | { |
| 6573 | struct coding_system coding; | 6573 | struct coding_system coding; |
| 6574 | 6574 | ||
| 6575 | CHECK_STRING (string, 0); | 6575 | CHECK_STRING (string); |
| 6576 | CHECK_SYMBOL (coding_system, 1); | 6576 | CHECK_SYMBOL (coding_system); |
| 6577 | 6577 | ||
| 6578 | if (NILP (coding_system)) | 6578 | if (NILP (coding_system)) |
| 6579 | return string; | 6579 | return string; |
| @@ -6597,7 +6597,7 @@ Return the corresponding character.") | |||
| 6597 | unsigned char c1, c2, s1, s2; | 6597 | unsigned char c1, c2, s1, s2; |
| 6598 | Lisp_Object val; | 6598 | Lisp_Object val; |
| 6599 | 6599 | ||
| 6600 | CHECK_NUMBER (code, 0); | 6600 | CHECK_NUMBER (code); |
| 6601 | s1 = (XFASTINT (code)) >> 8, s2 = (XFASTINT (code)) & 0xFF; | 6601 | s1 = (XFASTINT (code)) >> 8, s2 = (XFASTINT (code)) & 0xFF; |
| 6602 | if (s1 == 0) | 6602 | if (s1 == 0) |
| 6603 | { | 6603 | { |
| @@ -6628,7 +6628,7 @@ Return the corresponding code in SJIS.") | |||
| 6628 | int charset, c1, c2, s1, s2; | 6628 | int charset, c1, c2, s1, s2; |
| 6629 | Lisp_Object val; | 6629 | Lisp_Object val; |
| 6630 | 6630 | ||
| 6631 | CHECK_NUMBER (ch, 0); | 6631 | CHECK_NUMBER (ch); |
| 6632 | SPLIT_CHAR (XFASTINT (ch), charset, c1, c2); | 6632 | SPLIT_CHAR (XFASTINT (ch), charset, c1, c2); |
| 6633 | if (charset == CHARSET_ASCII) | 6633 | if (charset == CHARSET_ASCII) |
| 6634 | { | 6634 | { |
| @@ -6660,7 +6660,7 @@ Return the corresponding character.") | |||
| 6660 | unsigned char b1, b2, c1, c2; | 6660 | unsigned char b1, b2, c1, c2; |
| 6661 | Lisp_Object val; | 6661 | Lisp_Object val; |
| 6662 | 6662 | ||
| 6663 | CHECK_NUMBER (code, 0); | 6663 | CHECK_NUMBER (code); |
| 6664 | b1 = (XFASTINT (code)) >> 8, b2 = (XFASTINT (code)) & 0xFF; | 6664 | b1 = (XFASTINT (code)) >> 8, b2 = (XFASTINT (code)) & 0xFF; |
| 6665 | if (b1 == 0) | 6665 | if (b1 == 0) |
| 6666 | { | 6666 | { |
| @@ -6688,7 +6688,7 @@ Return the corresponding character code in Big5.") | |||
| 6688 | int charset, c1, c2, b1, b2; | 6688 | int charset, c1, c2, b1, b2; |
| 6689 | Lisp_Object val; | 6689 | Lisp_Object val; |
| 6690 | 6690 | ||
| 6691 | CHECK_NUMBER (ch, 0); | 6691 | CHECK_NUMBER (ch); |
| 6692 | SPLIT_CHAR (XFASTINT (ch), charset, c1, c2); | 6692 | SPLIT_CHAR (XFASTINT (ch), charset, c1, c2); |
| 6693 | if (charset == CHARSET_ASCII) | 6693 | if (charset == CHARSET_ASCII) |
| 6694 | { | 6694 | { |
| @@ -6713,7 +6713,7 @@ DEFUN ("set-terminal-coding-system-internal", | |||
| 6713 | (coding_system) | 6713 | (coding_system) |
| 6714 | Lisp_Object coding_system; | 6714 | Lisp_Object coding_system; |
| 6715 | { | 6715 | { |
| 6716 | CHECK_SYMBOL (coding_system, 0); | 6716 | CHECK_SYMBOL (coding_system); |
| 6717 | setup_coding_system (Fcheck_coding_system (coding_system), &terminal_coding); | 6717 | setup_coding_system (Fcheck_coding_system (coding_system), &terminal_coding); |
| 6718 | /* We had better not send unsafe characters to terminal. */ | 6718 | /* We had better not send unsafe characters to terminal. */ |
| 6719 | terminal_coding.flags |= CODING_FLAG_ISO_SAFE; | 6719 | terminal_coding.flags |= CODING_FLAG_ISO_SAFE; |
| @@ -6732,7 +6732,7 @@ DEFUN ("set-safe-terminal-coding-system-internal", | |||
| 6732 | (coding_system) | 6732 | (coding_system) |
| 6733 | Lisp_Object coding_system; | 6733 | Lisp_Object coding_system; |
| 6734 | { | 6734 | { |
| 6735 | CHECK_SYMBOL (coding_system, 0); | 6735 | CHECK_SYMBOL (coding_system); |
| 6736 | setup_coding_system (Fcheck_coding_system (coding_system), | 6736 | setup_coding_system (Fcheck_coding_system (coding_system), |
| 6737 | &safe_terminal_coding); | 6737 | &safe_terminal_coding); |
| 6738 | /* Character composition should be disabled. */ | 6738 | /* Character composition should be disabled. */ |
| @@ -6758,7 +6758,7 @@ DEFUN ("set-keyboard-coding-system-internal", | |||
| 6758 | (coding_system) | 6758 | (coding_system) |
| 6759 | Lisp_Object coding_system; | 6759 | Lisp_Object coding_system; |
| 6760 | { | 6760 | { |
| 6761 | CHECK_SYMBOL (coding_system, 0); | 6761 | CHECK_SYMBOL (coding_system); |
| 6762 | setup_coding_system (Fcheck_coding_system (coding_system), &keyboard_coding); | 6762 | setup_coding_system (Fcheck_coding_system (coding_system), &keyboard_coding); |
| 6763 | /* Character composition should be disabled. */ | 6763 | /* Character composition should be disabled. */ |
| 6764 | keyboard_coding.composing = COMPOSITION_DISABLED; | 6764 | keyboard_coding.composing = COMPOSITION_DISABLED; |