From: Philipp Stephani <phst@google.com>
Date: Wed, 23 Dec 2020 10:43:37 +0000 (+0100)
Subject: Remove an unused parameter from 'child_setup' function.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~18^2~4851
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3edc4fd53ff9e1355da2371400aac4d5897ca190;p=emacs.git

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.
---

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,
     }
 
 #ifdef MSDOS /* MW, July 1993 */
-  status = child_setup (filefd, fd_output, fd_error, new_argv, 0, current_dir);
+  status = child_setup (filefd, fd_output, fd_error, new_argv, current_dir);
 
   if (status < 0)
     {
@@ -589,7 +589,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
   block_child_signal (&oldset);
 
 #ifdef WINDOWSNT
-  pid = child_setup (filefd, fd_output, fd_error, new_argv, 0, current_dir);
+  pid = child_setup (filefd, fd_output, fd_error, new_argv, current_dir);
 #else  /* not WINDOWSNT */
 
   /* 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,
       signal (SIGPROF, SIG_DFL);
 #endif
 
-      child_setup (filefd, fd_output, fd_error, new_argv, 0, current_dir);
+      child_setup (filefd, fd_output, fd_error, new_argv, current_dir);
     }
 
 #endif /* not WINDOWSNT */
@@ -1205,8 +1205,6 @@ exec_failed (char const *name, int err)
    Initialize inferior's priority, pgrp, connected dir and environment.
    then exec another program based on new_argv.
 
-   If SET_PGRP, put the subprocess into a separate process group.
-
    CURRENT_DIR is an elisp string giving the path of the current
    directory the subprocess should have.  Since we can't really signal
    a decent error from within the child, this should be verified as an
@@ -1217,7 +1215,7 @@ exec_failed (char const *name, int err)
    On MS-DOS, either return an exit status or signal an error.  */
 
 CHILD_SETUP_TYPE
-child_setup (int in, int out, int err, char **new_argv, bool set_pgrp,
+child_setup (int in, int out, int err, char **new_argv,
 	     Lisp_Object current_dir)
 {
   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);
 # define CHILD_SETUP_ERROR_DESC "Doing vfork"
 #endif
 
-extern CHILD_SETUP_TYPE child_setup (int, int, int, char **, bool, Lisp_Object);
+extern CHILD_SETUP_TYPE child_setup (int, int, int, char **, Lisp_Object);
 extern void init_callproc_1 (void);
 extern void init_callproc (void);
 extern 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)
       if (forkerr < 0)
 	forkerr = forkout;
 #ifdef WINDOWSNT
-      pid = child_setup (forkin, forkout, forkerr, new_argv, 1, current_dir);
+      pid = child_setup (forkin, forkout, forkerr, new_argv, current_dir);
 #else  /* not WINDOWSNT */
-      child_setup (forkin, forkout, forkerr, new_argv, 1, current_dir);
+      child_setup (forkin, forkout, forkerr, new_argv, current_dir);
 #endif /* not WINDOWSNT */
     }