diff options
| author | Paul Eggert | 2011-03-26 19:12:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-26 19:12:36 -0700 |
| commit | c5101a77a4066d979698d356c3a9c7f387007359 (patch) | |
| tree | 0d18e8940a4fac6092a98a07bcc625bd29e67179 /src/process.c | |
| parent | dd3f25f792d724f59fac3e2d4faa21b311f21137 (diff) | |
| download | emacs-c5101a77a4066d979698d356c3a9c7f387007359.tar.gz emacs-c5101a77a4066d979698d356c3a9c7f387007359.zip | |
Variadic C functions now count arguments with size_t, not int.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/process.c b/src/process.c index 639b6a49fce..ecda8e08012 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -1512,11 +1512,11 @@ the command through a shell and redirect one of them using the shell | |||
| 1512 | syntax. | 1512 | syntax. |
| 1513 | 1513 | ||
| 1514 | usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) | 1514 | usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) |
| 1515 | (int nargs, register Lisp_Object *args) | 1515 | (size_t nargs, register Lisp_Object *args) |
| 1516 | { | 1516 | { |
| 1517 | Lisp_Object buffer, name, program, proc, current_dir, tem; | 1517 | Lisp_Object buffer, name, program, proc, current_dir, tem; |
| 1518 | register unsigned char **new_argv; | 1518 | register unsigned char **new_argv; |
| 1519 | register int i; | 1519 | register size_t i; |
| 1520 | int count = SPECPDL_INDEX (); | 1520 | int count = SPECPDL_INDEX (); |
| 1521 | 1521 | ||
| 1522 | buffer = args[1]; | 1522 | buffer = args[1]; |
| @@ -1722,7 +1722,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) | |||
| 1722 | new_argv = (unsigned char **) alloca ((nargs - 1) * sizeof (char *)); | 1722 | new_argv = (unsigned char **) alloca ((nargs - 1) * sizeof (char *)); |
| 1723 | new_argv[nargs - 2] = 0; | 1723 | new_argv[nargs - 2] = 0; |
| 1724 | 1724 | ||
| 1725 | for (i = nargs - 3; i >= 0; i--) | 1725 | for (i = nargs - 2; i-- != 0; ) |
| 1726 | { | 1726 | { |
| 1727 | new_argv[i] = SDATA (XCAR (tem)); | 1727 | new_argv[i] = SDATA (XCAR (tem)); |
| 1728 | tem = XCDR (tem); | 1728 | tem = XCDR (tem); |
| @@ -2681,7 +2681,7 @@ Examples: | |||
| 2681 | \(serial-process-configure :port "\\\\.\\COM13" :bytesize 7) | 2681 | \(serial-process-configure :port "\\\\.\\COM13" :bytesize 7) |
| 2682 | 2682 | ||
| 2683 | usage: (serial-process-configure &rest ARGS) */) | 2683 | usage: (serial-process-configure &rest ARGS) */) |
| 2684 | (int nargs, Lisp_Object *args) | 2684 | (size_t nargs, Lisp_Object *args) |
| 2685 | { | 2685 | { |
| 2686 | struct Lisp_Process *p; | 2686 | struct Lisp_Process *p; |
| 2687 | Lisp_Object contact = Qnil; | 2687 | Lisp_Object contact = Qnil; |
| @@ -2799,7 +2799,7 @@ Examples: | |||
| 2799 | \(make-serial-process :port "/dev/tty.BlueConsole-SPP-1" :speed nil) | 2799 | \(make-serial-process :port "/dev/tty.BlueConsole-SPP-1" :speed nil) |
| 2800 | 2800 | ||
| 2801 | usage: (make-serial-process &rest ARGS) */) | 2801 | usage: (make-serial-process &rest ARGS) */) |
| 2802 | (int nargs, Lisp_Object *args) | 2802 | (size_t nargs, Lisp_Object *args) |
| 2803 | { | 2803 | { |
| 2804 | int fd = -1; | 2804 | int fd = -1; |
| 2805 | Lisp_Object proc, contact, port; | 2805 | Lisp_Object proc, contact, port; |
| @@ -3077,7 +3077,7 @@ The original argument list, modified with the actual connection | |||
| 3077 | information, is available via the `process-contact' function. | 3077 | information, is available via the `process-contact' function. |
| 3078 | 3078 | ||
| 3079 | usage: (make-network-process &rest ARGS) */) | 3079 | usage: (make-network-process &rest ARGS) */) |
| 3080 | (int nargs, Lisp_Object *args) | 3080 | (size_t nargs, Lisp_Object *args) |
| 3081 | { | 3081 | { |
| 3082 | Lisp_Object proc; | 3082 | Lisp_Object proc; |
| 3083 | Lisp_Object contact; | 3083 | Lisp_Object contact; |
| @@ -3393,7 +3393,8 @@ usage: (make-network-process &rest ARGS) */) | |||
| 3393 | 3393 | ||
| 3394 | for (lres = res; lres; lres = lres->ai_next) | 3394 | for (lres = res; lres; lres = lres->ai_next) |
| 3395 | { | 3395 | { |
| 3396 | int optn, optbits; | 3396 | size_t optn; |
| 3397 | int optbits; | ||
| 3397 | 3398 | ||
| 3398 | #ifdef WINDOWSNT | 3399 | #ifdef WINDOWSNT |
| 3399 | retry_connect: | 3400 | retry_connect: |