* [PATCH ucspi-vsock] vsockserver: consistently use diee instead of err
@ 2021-03-18 0:12 Alyssa Ross
2021-03-18 0:19 ` Cole Helbling
0 siblings, 1 reply; 3+ messages in thread
From: Alyssa Ross @ 2021-03-18 0:12 UTC (permalink / raw)
To: devel
diee is our function that respects the verbosity setting.
---
vsockserver.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/vsockserver.c b/vsockserver.c
index 0317cd4..8f809ec 100644
--- a/vsockserver.c
+++ b/vsockserver.c
@@ -3,7 +3,6 @@
#define _GNU_SOURCE
-#include <err.h>
#include <errno.h>
#include <inttypes.h>
#include <stdbool.h>
@@ -105,22 +104,22 @@ int main(int argc, char *argv[])
ilog("connection from %" PRIu32 " port %" PRIu32, rcid, rport);
switch (child = fork()) {
- case -1: err(EX_OSERR, "fork");
+ case -1: diee(EX_OSERR, "fork");
case 0:
if (dup2(conn, STDIN_FILENO) == -1)
- err(EX_OSERR, "dup2");
+ diee(EX_OSERR, "dup2");
if (dup2(conn, STDOUT_FILENO) == -1)
- err(EX_OSERR, "dup2");
+ diee(EX_OSERR, "dup2");
if (conn != 0 && conn != 1)
close(conn);
execvp(argv[optind], &argv[optind]);
- err(EX_OSERR, "exec");
+ diee(EX_OSERR, "exec");
}
if (waitpid(child, NULL, 0) == -1)
- err(EX_OSERR, "waitpid");
+ diee(EX_OSERR, "waitpid");
close(conn);
}
- err(EX_OSERR, "accept");
+ diee(EX_OSERR, "accept");
}
--
2.30.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH ucspi-vsock] vsockserver: consistently use diee instead of err
2021-03-18 0:12 [PATCH ucspi-vsock] vsockserver: consistently use diee instead of err Alyssa Ross
@ 2021-03-18 0:19 ` Cole Helbling
2021-03-18 0:44 ` Alyssa Ross
0 siblings, 1 reply; 3+ messages in thread
From: Cole Helbling @ 2021-03-18 0:19 UTC (permalink / raw)
To: Alyssa Ross, devel
On Wed Mar 17, 2021 at 5:12 PM PDT, Alyssa Ross wrote:
> diee is our function that respects the verbosity setting.
> ---
> vsockserver.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH ucspi-vsock] vsockserver: consistently use diee instead of err
2021-03-18 0:19 ` Cole Helbling
@ 2021-03-18 0:44 ` Alyssa Ross
0 siblings, 0 replies; 3+ messages in thread
From: Alyssa Ross @ 2021-03-18 0:44 UTC (permalink / raw)
To: Cole Helbling; +Cc: devel
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
>> diee is our function that respects the verbosity setting.
>> ---
>> vsockserver.c | 13 ++++++-------
>> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
Committed as 2a18621. :)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-18 0:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-18 0:12 [PATCH ucspi-vsock] vsockserver: consistently use diee instead of err Alyssa Ross
2021-03-18 0:19 ` Cole Helbling
2021-03-18 0:44 ` Alyssa Ross
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).