[openssh-commits] [openssh] 02/02: upstream: warnings fixes (static vs missing prototype, sign conversion)

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit a92ec36c73a0026fd75ac48810f215167cf33dcb
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Tue Sep 15 07:08:09 2026 +0000

    upstream: warnings fixes (static vs missing prototype, sign conversion)
    
    OpenBSD-Commit-ID: 9c9eca0844dd7205597c6a4bd6f97d868ca2a74c
---
 channels.c | 22 ++++++++++------------
 sshd.c     |  4 ++--
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/channels.c b/channels.c
index 262791301..24de19546 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.465 2026/09/15 06:05:47 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.466 2026/09/15 07:08:09 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -392,9 +392,9 @@ channel_set_xtype(struct ssh *ssh, int id, const char *xctype)
 		c->inactive_deadline = xtype_deadline;
 	channel_classify(ssh, c);
 	/* report effective timeout: per-channel if set, else global */
-	debug2_f("labeled channel %d as %s (inactive timeout %u)", id, xctype,
-	    c->inactive_deadline != 0 ? c->inactive_deadline
-	    : (u_int)sc->global_deadline);
+	debug2_f("labeled channel %d as %s (inactive timeout %d)", id, xctype,
+	    c->inactive_deadline != 0 ?
+	    c->inactive_deadline : sc->global_deadline);
 }
 
 /*
@@ -564,10 +564,9 @@ channel_new(struct ssh *ssh, char *ctype, int type, int rfd, int wfd, int efd,
 	c->inactive_deadline = lookup_timeout(ssh, c->ctype);
 	TAILQ_INIT(&c->status_confirms);
 	channel_classify(ssh, c);
-	debug("channel %d: new %s [%s] (inactive timeout: %u)",
-	    found, c->ctype, remote_name,
-	    c->inactive_deadline != 0 ? c->inactive_deadline
-	    : (u_int)sc->global_deadline);
+	debug("channel %d: new %s [%s] (inactive timeout: %d)",
+	    found, c->ctype, remote_name, c->inactive_deadline != 0 ?
+	    c->inactive_deadline : sc->global_deadline);
 	return c;
 }
 
@@ -2715,10 +2714,9 @@ channel_handler(struct ssh *ssh, int table, struct timespec *timeout)
 			    channel_get_expiry(ssh, c) != 0 &&
 			    now >= channel_get_expiry(ssh, c)) {
 				/* channel closed for inactivity */
-				u_int fired_deadline = c->inactive_deadline != 0
-				    ? c->inactive_deadline
-				    : (u_int)sc->global_deadline;
-				verbose("channel %d: closing after %u seconds "
+				int fired_deadline = c->inactive_deadline != 0 ?
+				    c->inactive_deadline : sc->global_deadline;
+				verbose("channel %d: closing after %d seconds "
 				    "of inactivity", c->self, fired_deadline);
 				channel_force_close(ssh, c, 1);
 			} else if (c->notbefore <= now) {
diff --git a/sshd.c b/sshd.c
index 2849eedcc..62f6a1313 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.631 2026/09/15 06:49:51 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.632 2026/09/15 07:08:09 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  * Copyright (c) 2002 Niels Provos.  All rights reserved.
@@ -1273,7 +1273,7 @@ prepare_proctitle(int ac, char **av)
 }
 
 /* Disconnect from the controlling tty. */
-void
+static void
 disconnect_controlling_tty(void)
 {
 #ifdef TIOCNOTTY

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.