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/process.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/process.c')
| -rw-r--r-- | src/process.c | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/src/process.c b/src/process.c index ed0db6072fb..3d0a84d4c7b 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -493,7 +493,7 @@ DEFUN ("get-process", Fget_process, Sget_process, 1, 1, 0, | |||
| 493 | { | 493 | { |
| 494 | if (PROCESSP (name)) | 494 | if (PROCESSP (name)) |
| 495 | return name; | 495 | return name; |
| 496 | CHECK_STRING (name, 0); | 496 | CHECK_STRING (name); |
| 497 | return Fcdr (Fassoc (name, Vprocess_alist)); | 497 | return Fcdr (Fassoc (name, Vprocess_alist)); |
| 498 | } | 498 | } |
| 499 | 499 | ||
| @@ -551,7 +551,7 @@ get_process (name) | |||
| 551 | } | 551 | } |
| 552 | else | 552 | else |
| 553 | { | 553 | { |
| 554 | CHECK_PROCESS (obj, 0); | 554 | CHECK_PROCESS (obj); |
| 555 | proc = obj; | 555 | proc = obj; |
| 556 | } | 556 | } |
| 557 | return proc; | 557 | return proc; |
| @@ -634,7 +634,7 @@ If PROCESS has not yet exited or died, return 0. */) | |||
| 634 | (process) | 634 | (process) |
| 635 | register Lisp_Object process; | 635 | register Lisp_Object process; |
| 636 | { | 636 | { |
| 637 | CHECK_PROCESS (process, 0); | 637 | CHECK_PROCESS (process); |
| 638 | if (!NILP (XPROCESS (process)->raw_status_low)) | 638 | if (!NILP (XPROCESS (process)->raw_status_low)) |
| 639 | update_status (XPROCESS (process)); | 639 | update_status (XPROCESS (process)); |
| 640 | if (CONSP (XPROCESS (process)->status)) | 640 | if (CONSP (XPROCESS (process)->status)) |
| @@ -649,7 +649,7 @@ For a network connection, this value is nil. */) | |||
| 649 | (process) | 649 | (process) |
| 650 | register Lisp_Object process; | 650 | register Lisp_Object process; |
| 651 | { | 651 | { |
| 652 | CHECK_PROCESS (process, 0); | 652 | CHECK_PROCESS (process); |
| 653 | return XPROCESS (process)->pid; | 653 | return XPROCESS (process)->pid; |
| 654 | } | 654 | } |
| 655 | 655 | ||
| @@ -660,7 +660,7 @@ possibly modified to make it unique among process names. */) | |||
| 660 | (process) | 660 | (process) |
| 661 | register Lisp_Object process; | 661 | register Lisp_Object process; |
| 662 | { | 662 | { |
| 663 | CHECK_PROCESS (process, 0); | 663 | CHECK_PROCESS (process); |
| 664 | return XPROCESS (process)->name; | 664 | return XPROCESS (process)->name; |
| 665 | } | 665 | } |
| 666 | 666 | ||
| @@ -672,7 +672,7 @@ For a non-child channel, this is nil. */) | |||
| 672 | (process) | 672 | (process) |
| 673 | register Lisp_Object process; | 673 | register Lisp_Object process; |
| 674 | { | 674 | { |
| 675 | CHECK_PROCESS (process, 0); | 675 | CHECK_PROCESS (process); |
| 676 | return XPROCESS (process)->command; | 676 | return XPROCESS (process)->command; |
| 677 | } | 677 | } |
| 678 | 678 | ||
| @@ -683,7 +683,7 @@ not the name of the pty that Emacs uses to talk with that terminal. */) | |||
| 683 | (process) | 683 | (process) |
| 684 | register Lisp_Object process; | 684 | register Lisp_Object process; |
| 685 | { | 685 | { |
| 686 | CHECK_PROCESS (process, 0); | 686 | CHECK_PROCESS (process); |
| 687 | return XPROCESS (process)->tty_name; | 687 | return XPROCESS (process)->tty_name; |
| 688 | } | 688 | } |
| 689 | 689 | ||
| @@ -693,9 +693,9 @@ DEFUN ("set-process-buffer", Fset_process_buffer, Sset_process_buffer, | |||
| 693 | (process, buffer) | 693 | (process, buffer) |
| 694 | register Lisp_Object process, buffer; | 694 | register Lisp_Object process, buffer; |
| 695 | { | 695 | { |
| 696 | CHECK_PROCESS (process, 0); | 696 | CHECK_PROCESS (process); |
| 697 | if (!NILP (buffer)) | 697 | if (!NILP (buffer)) |
| 698 | CHECK_BUFFER (buffer, 1); | 698 | CHECK_BUFFER (buffer); |
| 699 | XPROCESS (process)->buffer = buffer; | 699 | XPROCESS (process)->buffer = buffer; |
| 700 | return buffer; | 700 | return buffer; |
| 701 | } | 701 | } |
| @@ -707,7 +707,7 @@ Output from PROCESS is inserted in this buffer unless PROCESS has a filter. */) | |||
| 707 | (process) | 707 | (process) |
| 708 | register Lisp_Object process; | 708 | register Lisp_Object process; |
| 709 | { | 709 | { |
| 710 | CHECK_PROCESS (process, 0); | 710 | CHECK_PROCESS (process); |
| 711 | return XPROCESS (process)->buffer; | 711 | return XPROCESS (process)->buffer; |
| 712 | } | 712 | } |
| 713 | 713 | ||
| @@ -717,7 +717,7 @@ DEFUN ("process-mark", Fprocess_mark, Sprocess_mark, | |||
| 717 | (process) | 717 | (process) |
| 718 | register Lisp_Object process; | 718 | register Lisp_Object process; |
| 719 | { | 719 | { |
| 720 | CHECK_PROCESS (process, 0); | 720 | CHECK_PROCESS (process); |
| 721 | return XPROCESS (process)->mark; | 721 | return XPROCESS (process)->mark; |
| 722 | } | 722 | } |
| 723 | 723 | ||
| @@ -734,7 +734,7 @@ If the process has a filter, its buffer is not used for output. */) | |||
| 734 | { | 734 | { |
| 735 | struct Lisp_Process *p; | 735 | struct Lisp_Process *p; |
| 736 | 736 | ||
| 737 | CHECK_PROCESS (process, 0); | 737 | CHECK_PROCESS (process); |
| 738 | p = XPROCESS (process); | 738 | p = XPROCESS (process); |
| 739 | 739 | ||
| 740 | /* Don't signal an error if the process' input file descriptor | 740 | /* Don't signal an error if the process' input file descriptor |
| @@ -770,7 +770,7 @@ See `set-process-filter' for more info on filter functions. */) | |||
| 770 | (process) | 770 | (process) |
| 771 | register Lisp_Object process; | 771 | register Lisp_Object process; |
| 772 | { | 772 | { |
| 773 | CHECK_PROCESS (process, 0); | 773 | CHECK_PROCESS (process); |
| 774 | return XPROCESS (process)->filter; | 774 | return XPROCESS (process)->filter; |
| 775 | } | 775 | } |
| 776 | 776 | ||
| @@ -782,7 +782,7 @@ It gets two arguments: the process, and a string describing the change. */) | |||
| 782 | (process, sentinel) | 782 | (process, sentinel) |
| 783 | register Lisp_Object process, sentinel; | 783 | register Lisp_Object process, sentinel; |
| 784 | { | 784 | { |
| 785 | CHECK_PROCESS (process, 0); | 785 | CHECK_PROCESS (process); |
| 786 | XPROCESS (process)->sentinel = sentinel; | 786 | XPROCESS (process)->sentinel = sentinel; |
| 787 | return sentinel; | 787 | return sentinel; |
| 788 | } | 788 | } |
| @@ -794,7 +794,7 @@ See `set-process-sentinel' for more info on sentinels. */) | |||
| 794 | (process) | 794 | (process) |
| 795 | register Lisp_Object process; | 795 | register Lisp_Object process; |
| 796 | { | 796 | { |
| 797 | CHECK_PROCESS (process, 0); | 797 | CHECK_PROCESS (process); |
| 798 | return XPROCESS (process)->sentinel; | 798 | return XPROCESS (process)->sentinel; |
| 799 | } | 799 | } |
| 800 | 800 | ||
| @@ -804,9 +804,9 @@ DEFUN ("set-process-window-size", Fset_process_window_size, | |||
| 804 | (process, height, width) | 804 | (process, height, width) |
| 805 | register Lisp_Object process, height, width; | 805 | register Lisp_Object process, height, width; |
| 806 | { | 806 | { |
| 807 | CHECK_PROCESS (process, 0); | 807 | CHECK_PROCESS (process); |
| 808 | CHECK_NATNUM (height, 0); | 808 | CHECK_NATNUM (height); |
| 809 | CHECK_NATNUM (width, 0); | 809 | CHECK_NATNUM (width); |
| 810 | 810 | ||
| 811 | if (XINT (XPROCESS (process)->infd) < 0 | 811 | if (XINT (XPROCESS (process)->infd) < 0 |
| 812 | || set_window_size (XINT (XPROCESS (process)->infd), | 812 | || set_window_size (XINT (XPROCESS (process)->infd), |
| @@ -836,7 +836,7 @@ for the process which will run. */) | |||
| 836 | (process, flag) | 836 | (process, flag) |
| 837 | register Lisp_Object process, flag; | 837 | register Lisp_Object process, flag; |
| 838 | { | 838 | { |
| 839 | CHECK_PROCESS (process, 0); | 839 | CHECK_PROCESS (process); |
| 840 | XPROCESS (process)->inherit_coding_system_flag = flag; | 840 | XPROCESS (process)->inherit_coding_system_flag = flag; |
| 841 | return flag; | 841 | return flag; |
| 842 | } | 842 | } |
| @@ -851,7 +851,7 @@ the process output. */) | |||
| 851 | (process) | 851 | (process) |
| 852 | register Lisp_Object process; | 852 | register Lisp_Object process; |
| 853 | { | 853 | { |
| 854 | CHECK_PROCESS (process, 0); | 854 | CHECK_PROCESS (process); |
| 855 | return XPROCESS (process)->inherit_coding_system_flag; | 855 | return XPROCESS (process)->inherit_coding_system_flag; |
| 856 | } | 856 | } |
| 857 | 857 | ||
| @@ -865,7 +865,7 @@ Value is t if a query was formerly required. */) | |||
| 865 | { | 865 | { |
| 866 | Lisp_Object tem; | 866 | Lisp_Object tem; |
| 867 | 867 | ||
| 868 | CHECK_PROCESS (process, 0); | 868 | CHECK_PROCESS (process); |
| 869 | tem = XPROCESS (process)->kill_without_query; | 869 | tem = XPROCESS (process)->kill_without_query; |
| 870 | XPROCESS (process)->kill_without_query = Fnull (value); | 870 | XPROCESS (process)->kill_without_query = Fnull (value); |
| 871 | 871 | ||
| @@ -879,7 +879,7 @@ For a net connection, the value is a cons cell of the form (HOST SERVICE). */) | |||
| 879 | (process) | 879 | (process) |
| 880 | register Lisp_Object process; | 880 | register Lisp_Object process; |
| 881 | { | 881 | { |
| 882 | CHECK_PROCESS (process, 0); | 882 | CHECK_PROCESS (process); |
| 883 | return XPROCESS (process)->childp; | 883 | return XPROCESS (process)->childp; |
| 884 | } | 884 | } |
| 885 | 885 | ||
| @@ -1090,11 +1090,11 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) | |||
| 1090 | } | 1090 | } |
| 1091 | 1091 | ||
| 1092 | name = args[0]; | 1092 | name = args[0]; |
| 1093 | CHECK_STRING (name, 0); | 1093 | CHECK_STRING (name); |
| 1094 | 1094 | ||
| 1095 | program = args[2]; | 1095 | program = args[2]; |
| 1096 | 1096 | ||
| 1097 | CHECK_STRING (program, 2); | 1097 | CHECK_STRING (program); |
| 1098 | 1098 | ||
| 1099 | proc = make_process (name); | 1099 | proc = make_process (name); |
| 1100 | /* If an error occurs and we can't start the process, we want to | 1100 | /* If an error occurs and we can't start the process, we want to |
| @@ -1169,7 +1169,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) | |||
| 1169 | for (i = 3; i < nargs; i++) | 1169 | for (i = 3; i < nargs; i++) |
| 1170 | { | 1170 | { |
| 1171 | tem = args[i]; | 1171 | tem = args[i]; |
| 1172 | CHECK_STRING (tem, i); | 1172 | CHECK_STRING (tem); |
| 1173 | len += STRING_BYTES (XSTRING (tem)) + 1; /* count the blank */ | 1173 | len += STRING_BYTES (XSTRING (tem)) + 1; /* count the blank */ |
| 1174 | } | 1174 | } |
| 1175 | new_argv = (unsigned char *) alloca (len); | 1175 | new_argv = (unsigned char *) alloca (len); |
| @@ -1177,7 +1177,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) | |||
| 1177 | for (i = 3; i < nargs; i++) | 1177 | for (i = 3; i < nargs; i++) |
| 1178 | { | 1178 | { |
| 1179 | tem = args[i]; | 1179 | tem = args[i]; |
| 1180 | CHECK_STRING (tem, i); | 1180 | CHECK_STRING (tem); |
| 1181 | strcat (new_argv, " "); | 1181 | strcat (new_argv, " "); |
| 1182 | strcat (new_argv, XSTRING (tem)->data); | 1182 | strcat (new_argv, XSTRING (tem)->data); |
| 1183 | } | 1183 | } |
| @@ -1220,7 +1220,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) | |||
| 1220 | for (i = 3; i < nargs; i++) | 1220 | for (i = 3; i < nargs; i++) |
| 1221 | { | 1221 | { |
| 1222 | tem = args[i]; | 1222 | tem = args[i]; |
| 1223 | CHECK_STRING (tem, i); | 1223 | CHECK_STRING (tem); |
| 1224 | if (STRING_MULTIBYTE (tem)) | 1224 | if (STRING_MULTIBYTE (tem)) |
| 1225 | tem = (code_convert_string_norecord | 1225 | tem = (code_convert_string_norecord |
| 1226 | (tem, XPROCESS (proc)->encode_coding_system, 1)); | 1226 | (tem, XPROCESS (proc)->encode_coding_system, 1)); |
| @@ -1784,8 +1784,8 @@ specifying a port number to connect to. */) | |||
| 1784 | #endif | 1784 | #endif |
| 1785 | 1785 | ||
| 1786 | GCPRO4 (name, buffer, host, service); | 1786 | GCPRO4 (name, buffer, host, service); |
| 1787 | CHECK_STRING (name, 0); | 1787 | CHECK_STRING (name); |
| 1788 | CHECK_STRING (host, 0); | 1788 | CHECK_STRING (host); |
| 1789 | 1789 | ||
| 1790 | #ifdef HAVE_GETADDRINFO | 1790 | #ifdef HAVE_GETADDRINFO |
| 1791 | /* SERVICE can either be a string or int. | 1791 | /* SERVICE can either be a string or int. |
| @@ -1797,7 +1797,7 @@ specifying a port number to connect to. */) | |||
| 1797 | } | 1797 | } |
| 1798 | else | 1798 | else |
| 1799 | { | 1799 | { |
| 1800 | CHECK_STRING (service, 0); | 1800 | CHECK_STRING (service); |
| 1801 | portstring = XSTRING (service)->data; | 1801 | portstring = XSTRING (service)->data; |
| 1802 | } | 1802 | } |
| 1803 | #else /* HAVE_GETADDRINFO */ | 1803 | #else /* HAVE_GETADDRINFO */ |
| @@ -1805,7 +1805,7 @@ specifying a port number to connect to. */) | |||
| 1805 | port = htons ((unsigned short) XINT (service)); | 1805 | port = htons ((unsigned short) XINT (service)); |
| 1806 | else | 1806 | else |
| 1807 | { | 1807 | { |
| 1808 | CHECK_STRING (service, 0); | 1808 | CHECK_STRING (service); |
| 1809 | svc_info = getservbyname (XSTRING (service)->data, "tcp"); | 1809 | svc_info = getservbyname (XSTRING (service)->data, "tcp"); |
| 1810 | if (svc_info == 0) | 1810 | if (svc_info == 0) |
| 1811 | error ("Unknown service \"%s\"", XSTRING (service)->data); | 1811 | error ("Unknown service \"%s\"", XSTRING (service)->data); |
| @@ -2250,11 +2250,11 @@ Return non-nil iff we received any output before the timeout expired. */) | |||
| 2250 | int useconds; | 2250 | int useconds; |
| 2251 | 2251 | ||
| 2252 | if (! NILP (process)) | 2252 | if (! NILP (process)) |
| 2253 | CHECK_PROCESS (process, 0); | 2253 | CHECK_PROCESS (process); |
| 2254 | 2254 | ||
| 2255 | if (! NILP (timeout_msecs)) | 2255 | if (! NILP (timeout_msecs)) |
| 2256 | { | 2256 | { |
| 2257 | CHECK_NUMBER (timeout_msecs, 2); | 2257 | CHECK_NUMBER (timeout_msecs); |
| 2258 | useconds = XINT (timeout_msecs); | 2258 | useconds = XINT (timeout_msecs); |
| 2259 | if (!INTEGERP (timeout)) | 2259 | if (!INTEGERP (timeout)) |
| 2260 | XSETINT (timeout, 0); | 2260 | XSETINT (timeout, 0); |
| @@ -2280,7 +2280,7 @@ Return non-nil iff we received any output before the timeout expired. */) | |||
| 2280 | 2280 | ||
| 2281 | if (! NILP (timeout)) | 2281 | if (! NILP (timeout)) |
| 2282 | { | 2282 | { |
| 2283 | CHECK_NUMBER (timeout, 1); | 2283 | CHECK_NUMBER (timeout); |
| 2284 | seconds = XINT (timeout); | 2284 | seconds = XINT (timeout); |
| 2285 | if (seconds < 0 || (seconds == 0 && useconds == 0)) | 2285 | if (seconds < 0 || (seconds == 0 && useconds == 0)) |
| 2286 | seconds = -1; | 2286 | seconds = -1; |
| @@ -3561,7 +3561,7 @@ Output from processes can arrive in between bunches. */) | |||
| 3561 | Lisp_Object process, string; | 3561 | Lisp_Object process, string; |
| 3562 | { | 3562 | { |
| 3563 | Lisp_Object proc; | 3563 | Lisp_Object proc; |
| 3564 | CHECK_STRING (string, 1); | 3564 | CHECK_STRING (string); |
| 3565 | proc = get_process (process); | 3565 | proc = get_process (process); |
| 3566 | send_process (proc, XSTRING (string)->data, | 3566 | send_process (proc, XSTRING (string)->data, |
| 3567 | STRING_BYTES (XSTRING (string)), string); | 3567 | STRING_BYTES (XSTRING (string)), string); |
| @@ -3904,7 +3904,7 @@ SIGCODE may be an integer, or a symbol whose name is a signal name. */) | |||
| 3904 | (pid, sigcode) | 3904 | (pid, sigcode) |
| 3905 | Lisp_Object pid, sigcode; | 3905 | Lisp_Object pid, sigcode; |
| 3906 | { | 3906 | { |
| 3907 | CHECK_NUMBER (pid, 0); | 3907 | CHECK_NUMBER (pid); |
| 3908 | 3908 | ||
| 3909 | #define handle_signal(NAME, VALUE) \ | 3909 | #define handle_signal(NAME, VALUE) \ |
| 3910 | else if (!strcmp (name, NAME)) \ | 3910 | else if (!strcmp (name, NAME)) \ |
| @@ -3916,7 +3916,7 @@ SIGCODE may be an integer, or a symbol whose name is a signal name. */) | |||
| 3916 | { | 3916 | { |
| 3917 | unsigned char *name; | 3917 | unsigned char *name; |
| 3918 | 3918 | ||
| 3919 | CHECK_SYMBOL (sigcode, 1); | 3919 | CHECK_SYMBOL (sigcode); |
| 3920 | name = XSYMBOL (sigcode)->name->data; | 3920 | name = XSYMBOL (sigcode)->name->data; |
| 3921 | 3921 | ||
| 3922 | if (0) | 3922 | if (0) |
| @@ -4516,7 +4516,7 @@ encode subprocess input. */) | |||
| 4516 | { | 4516 | { |
| 4517 | register struct Lisp_Process *p; | 4517 | register struct Lisp_Process *p; |
| 4518 | 4518 | ||
| 4519 | CHECK_PROCESS (proc, 0); | 4519 | CHECK_PROCESS (proc); |
| 4520 | p = XPROCESS (proc); | 4520 | p = XPROCESS (proc); |
| 4521 | if (XINT (p->infd) < 0) | 4521 | if (XINT (p->infd) < 0) |
| 4522 | error ("Input file descriptor of %s closed", XSTRING (p->name)->data); | 4522 | error ("Input file descriptor of %s closed", XSTRING (p->name)->data); |
| @@ -4539,7 +4539,7 @@ DEFUN ("process-coding-system", | |||
| 4539 | (proc) | 4539 | (proc) |
| 4540 | register Lisp_Object proc; | 4540 | register Lisp_Object proc; |
| 4541 | { | 4541 | { |
| 4542 | CHECK_PROCESS (proc, 0); | 4542 | CHECK_PROCESS (proc); |
| 4543 | return Fcons (XPROCESS (proc)->decode_coding_system, | 4543 | return Fcons (XPROCESS (proc)->decode_coding_system, |
| 4544 | XPROCESS (proc)->encode_coding_system); | 4544 | XPROCESS (proc)->encode_coding_system); |
| 4545 | } | 4545 | } |