aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPhilipp Stephani2020-12-23 11:43:37 +0100
committerPhilipp Stephani2020-12-23 11:44:54 +0100
commit3edc4fd53ff9e1355da2371400aac4d5897ca190 (patch)
tree72f2e8b00784cbb720eeacaa54826d00266906ae /src
parent268a3d32fb5a26c09787627d12a4dfc61ba059ff (diff)
downloademacs-3edc4fd53ff9e1355da2371400aac4d5897ca190.tar.gz
emacs-3edc4fd53ff9e1355da2371400aac4d5897ca190.zip
Remove an unused parameter from 'child_setup' function.
* src/callproc.c (child_setup): Remove unused SET_PGRP parameter. * src/callproc.c (call_process): * src/process.c (create_process): Fix all callers.
Diffstat (limited to 'src')
-rw-r--r--src/callproc.c10
-rw-r--r--src/lisp.h2
-rw-r--r--src/process.c4
3 files changed, 7 insertions, 9 deletions
diff --git a/src/callproc.c b/src/callproc.c
index 4bca1e5ebd3..5c5a2bb8929 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -542,7 +542,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
542 } 542 }
543 543
544#ifdef MSDOS /* MW, July 1993 */ 544#ifdef MSDOS /* MW, July 1993 */
545 status = child_setup (filefd, fd_output, fd_error, new_argv, 0, current_dir); 545 status = child_setup (filefd, fd_output, fd_error, new_argv, current_dir);
546 546
547 if (status < 0) 547 if (status < 0)
548 { 548 {
@@ -589,7 +589,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
589 block_child_signal (&oldset); 589 block_child_signal (&oldset);
590 590
591#ifdef WINDOWSNT 591#ifdef WINDOWSNT
592 pid = child_setup (filefd, fd_output, fd_error, new_argv, 0, current_dir); 592 pid = child_setup (filefd, fd_output, fd_error, new_argv, current_dir);
593#else /* not WINDOWSNT */ 593#else /* not WINDOWSNT */
594 594
595 /* vfork, and prevent local vars from being clobbered by the vfork. */ 595 /* vfork, and prevent local vars from being clobbered by the vfork. */
@@ -646,7 +646,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
646 signal (SIGPROF, SIG_DFL); 646 signal (SIGPROF, SIG_DFL);
647#endif 647#endif
648 648
649 child_setup (filefd, fd_output, fd_error, new_argv, 0, current_dir); 649 child_setup (filefd, fd_output, fd_error, new_argv, current_dir);
650 } 650 }
651 651
652#endif /* not WINDOWSNT */ 652#endif /* not WINDOWSNT */
@@ -1205,8 +1205,6 @@ exec_failed (char const *name, int err)
1205 Initialize inferior's priority, pgrp, connected dir and environment. 1205 Initialize inferior's priority, pgrp, connected dir and environment.
1206 then exec another program based on new_argv. 1206 then exec another program based on new_argv.
1207 1207
1208 If SET_PGRP, put the subprocess into a separate process group.
1209
1210 CURRENT_DIR is an elisp string giving the path of the current 1208 CURRENT_DIR is an elisp string giving the path of the current
1211 directory the subprocess should have. Since we can't really signal 1209 directory the subprocess should have. Since we can't really signal
1212 a decent error from within the child, this should be verified as an 1210 a decent error from within the child, this should be verified as an
@@ -1217,7 +1215,7 @@ exec_failed (char const *name, int err)
1217 On MS-DOS, either return an exit status or signal an error. */ 1215 On MS-DOS, either return an exit status or signal an error. */
1218 1216
1219CHILD_SETUP_TYPE 1217CHILD_SETUP_TYPE
1220child_setup (int in, int out, int err, char **new_argv, bool set_pgrp, 1218child_setup (int in, int out, int err, char **new_argv,
1221 Lisp_Object current_dir) 1219 Lisp_Object current_dir)
1222{ 1220{
1223 char **env; 1221 char **env;
diff --git a/src/lisp.h b/src/lisp.h
index e83304462fa..6e18433eaf8 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4500,7 +4500,7 @@ extern void setup_process_coding_systems (Lisp_Object);
4500# define CHILD_SETUP_ERROR_DESC "Doing vfork" 4500# define CHILD_SETUP_ERROR_DESC "Doing vfork"
4501#endif 4501#endif
4502 4502
4503extern CHILD_SETUP_TYPE child_setup (int, int, int, char **, bool, Lisp_Object); 4503extern CHILD_SETUP_TYPE child_setup (int, int, int, char **, Lisp_Object);
4504extern void init_callproc_1 (void); 4504extern void init_callproc_1 (void);
4505extern void init_callproc (void); 4505extern void init_callproc (void);
4506extern void set_initial_environment (void); 4506extern void set_initial_environment (void);
diff --git a/src/process.c b/src/process.c
index 9efefb1de73..b82942d42d0 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2254,9 +2254,9 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
2254 if (forkerr < 0) 2254 if (forkerr < 0)
2255 forkerr = forkout; 2255 forkerr = forkout;
2256#ifdef WINDOWSNT 2256#ifdef WINDOWSNT
2257 pid = child_setup (forkin, forkout, forkerr, new_argv, 1, current_dir); 2257 pid = child_setup (forkin, forkout, forkerr, new_argv, current_dir);
2258#else /* not WINDOWSNT */ 2258#else /* not WINDOWSNT */
2259 child_setup (forkin, forkout, forkerr, new_argv, 1, current_dir); 2259 child_setup (forkin, forkout, forkerr, new_argv, current_dir);
2260#endif /* not WINDOWSNT */ 2260#endif /* not WINDOWSNT */
2261 } 2261 }
2262 2262