From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 11 Aug 2022 23:52:00 +0000 (+0100)
Subject: prefork: consistently use -1 for "don't print errno"
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=5cdcee0988b64e4d90dffee1e5c179cc5c84f203;p=chiark-utils.git

prefork: consistently use -1 for "don't print errno"

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/cprogs/prefork.c b/cprogs/prefork.c
index 2563941..aaac059 100644
--- a/cprogs/prefork.c
+++ b/cprogs/prefork.c
@@ -19,7 +19,7 @@ void vmsgcore(int estatus, int errnoval, const char *fmt, va_list al) {
   if (logging) {
     const char *fmt_use = fmt;
     char *fmt_free = 0;
-    if (errnoval) {
+    if (errnoval!=-1) {
       r = asprintf(&fmt_free, "%s: %%m", fmt);
       if (r) {
 	fmt_free = 0;
diff --git a/cprogs/prefork.h b/cprogs/prefork.h
index a2ad102..617a455 100644
--- a/cprogs/prefork.h
+++ b/cprogs/prefork.h
@@ -67,13 +67,13 @@ void vmsgcore(int estatus, int errnoval, const char *fmt, va_list al);
   }
 
 DEF_MSG(warninge, /*empty*/, 0, errno, { });
-DEF_MSG(warning , /*empty*/, 0, 0,     { });
+DEF_MSG(warning , /*empty*/, 0, -1,    { });
 
 #define DEF_DIE(func, errnoval) \
   DEF_MSG(func, __attribute__((noreturn)), 127, errnoval, { abort(); })
 
 DEF_DIE(diee, errno)
-DEF_DIE(die,  0)
+DEF_DIE(die,  -1)
 
 #define MAX_OPTS 5