diff options
| author | Andreas Schwab | 1997-11-21 14:05:58 +0000 |
|---|---|---|
| committer | Andreas Schwab | 1997-11-21 14:05:58 +0000 |
| commit | dc22f25e590f671c5a4f3bcb17cc024655fd6c7a (patch) | |
| tree | 0a9aec257f50e2e15a878245fcd3dd3cff731edb /src | |
| parent | 9d815fd9b80a810b2f0dfb66277d1cebb5493cc8 (diff) | |
| download | emacs-dc22f25e590f671c5a4f3bcb17cc024655fd6c7a.tar.gz emacs-dc22f25e590f671c5a4f3bcb17cc024655fd6c7a.zip | |
(printchar): Declare `work' as unsigned char.
(internal_with_output_to_temp_buffer): Protoype parameter
FUNCTION.
(Ferror_message_string): Remove extra argument of
print_error_message.
(write_string): Define as returning nothing.
(write_string_1): Likewise.
(print_error_message): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/print.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/print.c b/src/print.c index 57193694f4a..48583dabd06 100644 --- a/src/print.c +++ b/src/print.c | |||
| @@ -318,7 +318,7 @@ printchar (ch, fun) | |||
| 318 | if (EQ (fun, Qnil)) | 318 | if (EQ (fun, Qnil)) |
| 319 | { | 319 | { |
| 320 | int len; | 320 | int len; |
| 321 | char work[4], *str; | 321 | unsigned char work[4], *str; |
| 322 | 322 | ||
| 323 | QUIT; | 323 | QUIT; |
| 324 | len = CHAR_STRING (ch, work, str); | 324 | len = CHAR_STRING (ch, work, str); |
| @@ -483,6 +483,7 @@ strout (ptr, size, printcharfun) | |||
| 483 | It isn't safe to use strout in many cases, | 483 | It isn't safe to use strout in many cases, |
| 484 | because printing one char can relocate. */ | 484 | because printing one char can relocate. */ |
| 485 | 485 | ||
| 486 | void | ||
| 486 | print_string (string, printcharfun) | 487 | print_string (string, printcharfun) |
| 487 | Lisp_Object string; | 488 | Lisp_Object string; |
| 488 | Lisp_Object printcharfun; | 489 | Lisp_Object printcharfun; |
| @@ -524,6 +525,7 @@ PRINTCHARFUN defaults to the value of `standard-output' (which see).") | |||
| 524 | on the default output stream. | 525 | on the default output stream. |
| 525 | Do not use this on the contents of a Lisp string. */ | 526 | Do not use this on the contents of a Lisp string. */ |
| 526 | 527 | ||
| 528 | void | ||
| 527 | write_string (data, size) | 529 | write_string (data, size) |
| 528 | char *data; | 530 | char *data; |
| 529 | int size; | 531 | int size; |
| @@ -542,6 +544,7 @@ write_string (data, size) | |||
| 542 | on a specified stream PRINTCHARFUN. | 544 | on a specified stream PRINTCHARFUN. |
| 543 | Do not use this on the contents of a Lisp string. */ | 545 | Do not use this on the contents of a Lisp string. */ |
| 544 | 546 | ||
| 547 | void | ||
| 545 | write_string_1 (data, size, printcharfun) | 548 | write_string_1 (data, size, printcharfun) |
| 546 | char *data; | 549 | char *data; |
| 547 | int size; | 550 | int size; |
| @@ -579,7 +582,7 @@ temp_output_buffer_setup (bufname) | |||
| 579 | Lisp_Object | 582 | Lisp_Object |
| 580 | internal_with_output_to_temp_buffer (bufname, function, args) | 583 | internal_with_output_to_temp_buffer (bufname, function, args) |
| 581 | char *bufname; | 584 | char *bufname; |
| 582 | Lisp_Object (*function) (); | 585 | Lisp_Object (*function) P_ ((Lisp_Object)); |
| 583 | Lisp_Object args; | 586 | Lisp_Object args; |
| 584 | { | 587 | { |
| 585 | int count = specpdl_ptr - specpdl; | 588 | int count = specpdl_ptr - specpdl; |
| @@ -820,7 +823,7 @@ DEFUN ("error-message-string", Ferror_message_string, Serror_message_string, | |||
| 820 | && NILP (XCONS (XCONS (obj)->cdr)->cdr)) | 823 | && NILP (XCONS (XCONS (obj)->cdr)->cdr)) |
| 821 | return XCONS (XCONS (obj)->cdr)->car; | 824 | return XCONS (XCONS (obj)->cdr)->car; |
| 822 | 825 | ||
| 823 | print_error_message (obj, Vprin1_to_string_buffer, NULL); | 826 | print_error_message (obj, Vprin1_to_string_buffer); |
| 824 | 827 | ||
| 825 | set_buffer_internal (XBUFFER (Vprin1_to_string_buffer)); | 828 | set_buffer_internal (XBUFFER (Vprin1_to_string_buffer)); |
| 826 | value = Fbuffer_string (); | 829 | value = Fbuffer_string (); |
| @@ -836,6 +839,7 @@ DEFUN ("error-message-string", Ferror_message_string, Serror_message_string, | |||
| 836 | /* Print an error message for the error DATA | 839 | /* Print an error message for the error DATA |
| 837 | onto Lisp output stream STREAM (suitable for the print functions). */ | 840 | onto Lisp output stream STREAM (suitable for the print functions). */ |
| 838 | 841 | ||
| 842 | void | ||
| 839 | print_error_message (data, stream) | 843 | print_error_message (data, stream) |
| 840 | Lisp_Object data, stream; | 844 | Lisp_Object data, stream; |
| 841 | { | 845 | { |