upstream: Explictly ignore return codes

where we don't check them.

OpenBSD-Commit-ID: 1ffb03038ba1b6b72667be50cf5e5e396b5f2740

diff --git a/scp.c b/scp.c
index 470b4f466e0d7393a8991df3c54833dfcba3a645..a2dea46ff9472bd7d96607a1c7c18cdd2e420a69 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.254 2023/03/27 03:25:08 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.255 2023/03/31 04:45:08 dtucker Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -194,11 +194,11 @@ killchild(int signo)
 {
        if (do_cmd_pid > 1) {
                kill(do_cmd_pid, signo ? signo : SIGTERM);
-               waitpid(do_cmd_pid, NULL, 0);
+               (void)waitpid(do_cmd_pid, NULL, 0);
        }
        if (do_cmd_pid2 > 1) {
                kill(do_cmd_pid2, signo ? signo : SIGTERM);
-               waitpid(do_cmd_pid2, NULL, 0);
+               (void)waitpid(do_cmd_pid2, NULL, 0);
        }
 
        if (signo)

diff --git a/sftp.c b/sftp.c
index 07b46c7f7cf26c11f5ef368bc8a2859b28dd4e31..13d05793c95a24608b3091dcad4a236f09786f53 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.231 2023/03/29 00:59:08 dtucker Exp $ */
+/* $OpenBSD: sftp.c,v 1.232 2023/03/31 04:45:08 dtucker Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -225,7 +225,7 @@ killchild(int signo)
        pid = sshpid;
        if (pid > 1) {
                kill(pid, SIGTERM);
-               waitpid(pid, NULL, 0);
+               (void)waitpid(pid, NULL, 0);
        }
 
        _exit(1);

diff --git a/ssh-agent.c b/ssh-agent.c
index 618bb198190e712f32598624eb4b0272476e8678..c72518ba353707e1f89d85117e68ca05a5e182a8 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.297 2023/03/09 21:06:24 jcs Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.298 2023/03/31 04:45:08 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2020,8 +2020,8 @@ main(int ac, char **av)
        sanitise_stdfd();
 
        /* drop */
-       setegid(getgid());
-       setgid(getgid());
+       (void)setegid(getgid());
+       (void)setgid(getgid());
 
        platform_disable_tracing(0);    /* strict=no */