diff options
| author | Tom Tromey | 2018-07-06 21:56:17 -0600 |
|---|---|---|
| committer | Tom Tromey | 2018-07-12 22:12:27 -0600 |
| commit | 42fe787b0f26c2df682b2797407a669ef8522ccb (patch) | |
| tree | e944fe465e2b65703a8361bc82647faf4f7907f1 /src/callproc.c | |
| parent | 01dbf2a347944497fdcf2ec156f4605020d7ba2a (diff) | |
| download | emacs-42fe787b0f26c2df682b2797407a669ef8522ccb.tar.gz emacs-42fe787b0f26c2df682b2797407a669ef8522ccb.zip | |
Rename integerp->fixnum, etc, in preparation for bignums
* src/json.c, src/keyboard.c, src/keyboard.h, src/keymap.c,
src/kqueue.c, src/lcms.c, src/lisp.h, src/lread.c, src/macros.c,
src/marker.c, src/menu.c, src/minibuf.c, src/msdos.c, src/print.c,
src/process.c, src/profiler.c, src/search.c, src/sound.c,
src/syntax.c, src/sysdep.c, src/term.c, src/terminal.c,
src/textprop.c, src/undo.c, src/w16select.c, src/w32.c,
src/w32console.c, src/w32cygwinx.c, src/w32fns.c, src/w32font.c,
src/w32inevt.c, src/w32proc.c, src/w32select.c, src/w32term.c,
src/w32uniscribe.c, src/widget.c, src/window.c, src/xdisp.c,
src/xfaces.c, src/xfns.c, src/xfont.c, src/xftfont.c, src/xmenu.c,
src/xrdb.c, src/xselect.c, src/xterm.c, src/xwidget.c: Rename
INTEGERP->FIXNUM, make_number->make_fixnum, CHECK_NUMBER->CHECK_FIXNUM,
make_natnum->make_fixed_natum, NUMBERP->FIXED_OR_FLOATP,
NATNUMP->FIXNATP, CHECK_NATNUM->CHECK_FIXNAT.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/callproc.c b/src/callproc.c index 17eb8132d96..f959927d37a 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -83,7 +83,7 @@ static pid_t synch_process_pid; | |||
| 83 | #ifdef MSDOS | 83 | #ifdef MSDOS |
| 84 | static Lisp_Object synch_process_tempfile; | 84 | static Lisp_Object synch_process_tempfile; |
| 85 | #else | 85 | #else |
| 86 | # define synch_process_tempfile make_number (0) | 86 | # define synch_process_tempfile make_fixnum (0) |
| 87 | #endif | 87 | #endif |
| 88 | 88 | ||
| 89 | /* Indexes of file descriptors that need closing on call_process_kill. */ | 89 | /* Indexes of file descriptors that need closing on call_process_kill. */ |
| @@ -324,7 +324,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, | |||
| 324 | #ifndef subprocesses | 324 | #ifndef subprocesses |
| 325 | /* Without asynchronous processes we cannot have BUFFER == 0. */ | 325 | /* Without asynchronous processes we cannot have BUFFER == 0. */ |
| 326 | if (nargs >= 3 | 326 | if (nargs >= 3 |
| 327 | && (INTEGERP (CONSP (args[2]) ? XCAR (args[2]) : args[2]))) | 327 | && (FIXNUMP (CONSP (args[2]) ? XCAR (args[2]) : args[2]))) |
| 328 | error ("Operating system cannot handle asynchronous subprocesses"); | 328 | error ("Operating system cannot handle asynchronous subprocesses"); |
| 329 | #endif /* subprocesses */ | 329 | #endif /* subprocesses */ |
| 330 | 330 | ||
| @@ -403,7 +403,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, | |||
| 403 | buffer = Qnil; | 403 | buffer = Qnil; |
| 404 | } | 404 | } |
| 405 | 405 | ||
| 406 | if (! (NILP (buffer) || EQ (buffer, Qt) || INTEGERP (buffer))) | 406 | if (! (NILP (buffer) || EQ (buffer, Qt) || FIXNUMP (buffer))) |
| 407 | { | 407 | { |
| 408 | Lisp_Object spec_buffer; | 408 | Lisp_Object spec_buffer; |
| 409 | spec_buffer = buffer; | 409 | spec_buffer = buffer; |
| @@ -431,7 +431,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, | |||
| 431 | for (i = 0; i < CALLPROC_FDS; i++) | 431 | for (i = 0; i < CALLPROC_FDS; i++) |
| 432 | callproc_fd[i] = -1; | 432 | callproc_fd[i] = -1; |
| 433 | #ifdef MSDOS | 433 | #ifdef MSDOS |
| 434 | synch_process_tempfile = make_number (0); | 434 | synch_process_tempfile = make_fixnum (0); |
| 435 | #endif | 435 | #endif |
| 436 | record_unwind_protect_ptr (call_process_kill, callproc_fd); | 436 | record_unwind_protect_ptr (call_process_kill, callproc_fd); |
| 437 | 437 | ||
| @@ -440,7 +440,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, | |||
| 440 | int ok; | 440 | int ok; |
| 441 | 441 | ||
| 442 | ok = openp (Vexec_path, args[0], Vexec_suffixes, &path, | 442 | ok = openp (Vexec_path, args[0], Vexec_suffixes, &path, |
| 443 | make_number (X_OK), false); | 443 | make_fixnum (X_OK), false); |
| 444 | if (ok < 0) | 444 | if (ok < 0) |
| 445 | report_file_error ("Searching for program", args[0]); | 445 | report_file_error ("Searching for program", args[0]); |
| 446 | } | 446 | } |
| @@ -471,7 +471,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, | |||
| 471 | path = ENCODE_FILE (path); | 471 | path = ENCODE_FILE (path); |
| 472 | new_argv[0] = SSDATA (path); | 472 | new_argv[0] = SSDATA (path); |
| 473 | 473 | ||
| 474 | discard_output = INTEGERP (buffer) || (NILP (buffer) && NILP (output_file)); | 474 | discard_output = FIXNUMP (buffer) || (NILP (buffer) && NILP (output_file)); |
| 475 | 475 | ||
| 476 | #ifdef MSDOS | 476 | #ifdef MSDOS |
| 477 | if (! discard_output && ! STRINGP (output_file)) | 477 | if (! discard_output && ! STRINGP (output_file)) |
| @@ -670,7 +670,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, | |||
| 670 | { | 670 | { |
| 671 | synch_process_pid = pid; | 671 | synch_process_pid = pid; |
| 672 | 672 | ||
| 673 | if (INTEGERP (buffer)) | 673 | if (FIXNUMP (buffer)) |
| 674 | { | 674 | { |
| 675 | if (tempfile_index < 0) | 675 | if (tempfile_index < 0) |
| 676 | record_deleted_pid (pid, Qnil); | 676 | record_deleted_pid (pid, Qnil); |
| @@ -703,7 +703,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, | |||
| 703 | 703 | ||
| 704 | #endif /* not MSDOS */ | 704 | #endif /* not MSDOS */ |
| 705 | 705 | ||
| 706 | if (INTEGERP (buffer)) | 706 | if (FIXNUMP (buffer)) |
| 707 | return unbind_to (count, Qnil); | 707 | return unbind_to (count, Qnil); |
| 708 | 708 | ||
| 709 | if (BUFFERP (buffer)) | 709 | if (BUFFERP (buffer)) |
| @@ -870,7 +870,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, | |||
| 870 | coding-system used to decode the process output. */ | 870 | coding-system used to decode the process output. */ |
| 871 | if (inherit_process_coding_system) | 871 | if (inherit_process_coding_system) |
| 872 | call1 (intern ("after-insert-file-set-buffer-file-coding-system"), | 872 | call1 (intern ("after-insert-file-set-buffer-file-coding-system"), |
| 873 | make_number (total_read)); | 873 | make_fixnum (total_read)); |
| 874 | } | 874 | } |
| 875 | 875 | ||
| 876 | bool wait_ok = true; | 876 | bool wait_ok = true; |
| @@ -903,7 +903,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, | |||
| 903 | } | 903 | } |
| 904 | 904 | ||
| 905 | eassert (WIFEXITED (status)); | 905 | eassert (WIFEXITED (status)); |
| 906 | return make_number (WEXITSTATUS (status)); | 906 | return make_fixnum (WEXITSTATUS (status)); |
| 907 | } | 907 | } |
| 908 | 908 | ||
| 909 | /* Create a temporary file suitable for storing the input data of | 909 | /* Create a temporary file suitable for storing the input data of |
| @@ -1644,7 +1644,7 @@ syms_of_callproc (void) | |||
| 1644 | staticpro (&Vtemp_file_name_pattern); | 1644 | staticpro (&Vtemp_file_name_pattern); |
| 1645 | 1645 | ||
| 1646 | #ifdef MSDOS | 1646 | #ifdef MSDOS |
| 1647 | synch_process_tempfile = make_number (0); | 1647 | synch_process_tempfile = make_fixnum (0); |
| 1648 | staticpro (&synch_process_tempfile); | 1648 | staticpro (&synch_process_tempfile); |
| 1649 | #endif | 1649 | #endif |
| 1650 | 1650 | ||