From 3f11e8d9a63050bd311fd6cd91817b6568da7b3a Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Wed, 10 Mar 2021 08:57:28 -0700
Subject: [PATCH] Quiet a few Solaris Studio compiler warnings.

---
 lib/eventlog/logwrap.c                          | 8 ++++----
 plugins/python/python_plugin_approval_multi.inc | 2 +-
 plugins/python/python_plugin_audit_multi.inc    | 2 +-
 plugins/python/python_plugin_io_multi.inc       | 2 +-
 src/get_pty.c                                   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/eventlog/logwrap.c b/lib/eventlog/logwrap.c
index 4c3532056..615598230 100644
--- a/lib/eventlog/logwrap.c
+++ b/lib/eventlog/logwrap.c
@@ -46,9 +46,9 @@ eventlog_writeln(FILE *fp, char *line, size_t linelen, size_t maxlen)
 	/* Maximum length too small, disable wrapping. */
 	outlen = fwrite(line, 1, linelen, fp);
 	if (outlen != linelen)
-	    debug_return_size_t(-1);
+	    debug_return_ssize_t(-1);
 	if (fputc('\n', fp) == EOF)
-	    debug_return_size_t(-1);
+	    debug_return_ssize_t(-1);
 	debug_return_int(outlen + 1);
     }
 
@@ -67,7 +67,7 @@ eventlog_writeln(FILE *fp, char *line, size_t linelen, size_t maxlen)
 	}
 	len = fprintf(fp, "%s%.*s\n", indent, (int)(end - beg), beg);
 	if (len < 0)
-	    debug_return_size_t(-1);
+	    debug_return_ssize_t(-1);
 	outlen += len;
 	while (*end == ' ')
 	    end++;
@@ -82,7 +82,7 @@ eventlog_writeln(FILE *fp, char *line, size_t linelen, size_t maxlen)
     if (linelen) {
 	len = fprintf(fp, "%s%s\n", indent, beg);
 	if (len < 0)
-	    debug_return_size_t(-1);
+	    debug_return_ssize_t(-1);
 	outlen += len;
     }
 
diff --git a/plugins/python/python_plugin_approval_multi.inc b/plugins/python/python_plugin_approval_multi.inc
index 6ee16bebf..941c14d32 100644
--- a/plugins/python/python_plugin_approval_multi.inc
+++ b/plugins/python/python_plugin_approval_multi.inc
@@ -8,7 +8,7 @@
 #define CALLBACK_CFUNC(func_name) APPROVAL_SYMBOL_NAME(_python_plugin_approval_ ## func_name)
 
 extern struct approval_plugin APPROVAL_SYMBOL_NAME(python_approval);
-static struct ApprovalPluginContext PLUGIN_CTX = { {}, &APPROVAL_SYMBOL_NAME(python_approval) };
+static struct ApprovalPluginContext PLUGIN_CTX = { { NULL }, &APPROVAL_SYMBOL_NAME(python_approval) };
 
 
 int
diff --git a/plugins/python/python_plugin_audit_multi.inc b/plugins/python/python_plugin_audit_multi.inc
index bb65f9ee8..3dc8c1768 100644
--- a/plugins/python/python_plugin_audit_multi.inc
+++ b/plugins/python/python_plugin_audit_multi.inc
@@ -8,7 +8,7 @@
 #define CALLBACK_CFUNC(func_name) AUDIT_SYMBOL_NAME(_python_plugin_audit_ ## func_name)
 
 extern struct audit_plugin AUDIT_SYMBOL_NAME(python_audit);
-static struct AuditPluginContext PLUGIN_CTX = { {}, &AUDIT_SYMBOL_NAME(python_audit) };
+static struct AuditPluginContext PLUGIN_CTX = { { NULL }, &AUDIT_SYMBOL_NAME(python_audit) };
 
 
 static int
diff --git a/plugins/python/python_plugin_io_multi.inc b/plugins/python/python_plugin_io_multi.inc
index bf776f3e8..2ccdb5e68 100644
--- a/plugins/python/python_plugin_io_multi.inc
+++ b/plugins/python/python_plugin_io_multi.inc
@@ -8,7 +8,7 @@
 #define CALLBACK_CFUNC(func_name) IO_SYMBOL_NAME(_python_plugin_io_ ## func_name)
 
 extern struct io_plugin IO_SYMBOL_NAME(python_io);
-static struct IOPluginContext PLUGIN_CTX = { {}, &IO_SYMBOL_NAME(python_io) };
+static struct IOPluginContext PLUGIN_CTX = { { NULL }, &IO_SYMBOL_NAME(python_io) };
 
 int
 CALLBACK_CFUNC(open)(
diff --git a/src/get_pty.c b/src/get_pty.c
index e50a9a633..f03089a7e 100644
--- a/src/get_pty.c
+++ b/src/get_pty.c
@@ -55,7 +55,7 @@ bool
 get_pty(int *leader, int *follower, char *name, size_t namesz, uid_t ttyuid)
 {
     struct group *gr;
-    gid_t ttygid = -1;
+    gid_t ttygid = (gid_t)-1;
     bool ret = false;
     debug_decl(get_pty, SUDO_DEBUG_PTY);