Add some casts to quiet gcc warnings on Solaris and remove a

now-useless debug printf.

diff --git a/plugins/sudoers/timestamp.c b/plugins/sudoers/timestamp.c
index a3b32383c733351838c9f05b19a0366f9028877d..0127a50aa7031f78b00ed46c96331e7eee04dfe5 100644 (file)
--- a/plugins/sudoers/timestamp.c
+++ b/plugins/sudoers/timestamp.c
@@ -160,7 +160,7 @@ ts_mkdirs(char *path, uid_t owner, mode_t mode, mode_t parent_mode, bool quiet)
     if (ret) {
        /* Create final path component. */
        sudo_debug_printf(SUDO_DEBUG_DEBUG|SUDO_DEBUG_LINENO,
-           "mkdir %s, mode 0%o, uid %d, gid %d", path, mode,
+           "mkdir %s, mode 0%o, uid %d, gid %d", path, (int)mode,
            (int)owner, (int)parent_gid);
        if (mkdir(path, mode) != 0 && errno != EEXIST) {
            if (!quiet)

diff --git a/src/exec_monitor.c b/src/exec_monitor.c
index b447f47faa463c26ab672534837acb6fa4f8e6a9..0e6e74939b6769dd8b49c5bd35b6dcb10c21d3fd 100644 (file)
--- a/src/exec_monitor.c
+++ b/src/exec_monitor.c
@@ -211,29 +211,27 @@ handle_sigchld(int backchannel, struct command_status *cstat)
        errno = ECHILD;
        /* FALLTHROUGH */
     case -1:
-       sudo_debug_printf(SUDO_DEBUG_DIAG,
-           "waitpid returned %d, expected pid %d", pid, cmnd_pid);
        sudo_warn(U_("%s: %s"), __func__, "waitpid");
        debug_return;
     }
 
     if (WIFCONTINUED(status)) {
        sudo_debug_printf(SUDO_DEBUG_INFO, "%s: command (%d) resumed",
-           __func__, cmnd_pid);
+           __func__, (int)cmnd_pid);
     } else if (WIFSTOPPED(status)) {
        if (sig2str(WSTOPSIG(status), signame) == -1)
            snprintf(signame, sizeof(signame), "%d", WSTOPSIG(status));
        sudo_debug_printf(SUDO_DEBUG_INFO, "%s: command (%d) stopped, SIG%s",
-           __func__, cmnd_pid, signame);
+           __func__, (int)cmnd_pid, signame);
     } else if (WIFSIGNALED(status)) {
        if (sig2str(WTERMSIG(status), signame) == -1)
            snprintf(signame, sizeof(signame), "%d", WTERMSIG(status));
        sudo_debug_printf(SUDO_DEBUG_INFO, "%s: command (%d) killed, SIG%s",
-           __func__, cmnd_pid, signame);
+           __func__, (int)cmnd_pid, signame);
        cmnd_pid = -1;
     } else if (WIFEXITED(status)) {
        sudo_debug_printf(SUDO_DEBUG_INFO, "%s: command (%d) exited: %d",
-           __func__, cmnd_pid, WEXITSTATUS(status));
+           __func__, (int)cmnd_pid, WEXITSTATUS(status));
        cmnd_pid = -1;
     } else {
        sudo_debug_printf(SUDO_DEBUG_WARN,