isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quiet a few Solaris Studio compiler warnings.

Browse Source
This commit is contained in:
Todd C. Miller
2021-03-10 08:57:28 -07:00
parent b8e588565b
commit 3f11e8d9a6
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/eventlog/logwrap.c
View File

@@ -46,9 +46,9 @@ eventlog_writeln(FILE *fp, char *line, size_t linelen, size_t maxlen)
/* Maximum length too small, disable wrapping. */ /* Maximum length too small, disable wrapping. */
outlen = fwrite(line, 1, linelen, fp); outlen = fwrite(line, 1, linelen, fp);
if (outlen != linelen) if (outlen != linelen)
debug_return_size_t(-1); debug_return_ssize_t(-1);
if (fputc('\n', fp) == EOF) if (fputc('\n', fp) == EOF)
debug_return_size_t(-1); debug_return_ssize_t(-1);
debug_return_int(outlen + 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); len = fprintf(fp, "%s%.*s\n", indent, (int)(end - beg), beg);
if (len < 0) if (len < 0)
debug_return_size_t(-1); debug_return_ssize_t(-1);
outlen += len; outlen += len;
while (*end == ' ') while (*end == ' ')
end++; end++;
@@ -82,7 +82,7 @@ eventlog_writeln(FILE *fp, char *line, size_t linelen, size_t maxlen)
if (linelen) { if (linelen) {
len = fprintf(fp, "%s%s\n", indent, beg); len = fprintf(fp, "%s%s\n", indent, beg);
if (len < 0) if (len < 0)
debug_return_size_t(-1); debug_return_ssize_t(-1);
outlen += len; outlen += len;
} }

2
plugins/python/python_plugin_approval_multi.inc
View File

@@ -8,7 +8,7 @@
#define CALLBACK_CFUNC(func_name) APPROVAL_SYMBOL_NAME(_python_plugin_approval_ ## func_name) #define CALLBACK_CFUNC(func_name) APPROVAL_SYMBOL_NAME(_python_plugin_approval_ ## func_name)
extern struct approval_plugin APPROVAL_SYMBOL_NAME(python_approval); 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 int

2
plugins/python/python_plugin_audit_multi.inc
View File

@@ -8,7 +8,7 @@
#define CALLBACK_CFUNC(func_name) AUDIT_SYMBOL_NAME(_python_plugin_audit_ ## func_name) #define CALLBACK_CFUNC(func_name) AUDIT_SYMBOL_NAME(_python_plugin_audit_ ## func_name)
extern struct audit_plugin AUDIT_SYMBOL_NAME(python_audit); 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 static int

2
plugins/python/python_plugin_io_multi.inc
View File

@@ -8,7 +8,7 @@
#define CALLBACK_CFUNC(func_name) IO_SYMBOL_NAME(_python_plugin_io_ ## func_name) #define CALLBACK_CFUNC(func_name) IO_SYMBOL_NAME(_python_plugin_io_ ## func_name)
extern struct io_plugin IO_SYMBOL_NAME(python_io); 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 int
CALLBACK_CFUNC(open)( CALLBACK_CFUNC(open)(

2
src/get_pty.c
View File

@@ -55,7 +55,7 @@ bool
get_pty(int *leader, int *follower, char *name, size_t namesz, uid_t ttyuid) get_pty(int *leader, int *follower, char *name, size_t namesz, uid_t ttyuid)
{ {
struct group *gr; struct group *gr;
gid_t ttygid = -1; gid_t ttygid = (gid_t)-1;
bool ret = false; bool ret = false;
debug_decl(get_pty, SUDO_DEBUG_PTY); debug_decl(get_pty, SUDO_DEBUG_PTY);