From 243cc3165664d5ae4b313da4d8b5d8b7f52046a3 Mon Sep 17 00:00:00 2001 From: dtucker Date: Fri, 13 Jun 2008 00:58:10 +0000 Subject: [PATCH] - dtucker@cvs.openbsd.org 2008/06/13 00:47:53 [mux.c] upcast size_t to u_long to match format arg; ok djm@ --- ChangeLog | 3 +++ mux.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f57930d..0dc6d740 100644 --- a/ChangeLog +++ b/ChangeLog @@ -148,6 +148,9 @@ fall back to creating a new TCP connection on most multiplexing errors (socket connect fail, invalid version, refused permittion, corrupted messages, etc.); bz #1329 ok dtucker@ + - dtucker@cvs.openbsd.org 2008/06/13 00:47:53 + [mux.c] + upcast size_t to u_long to match format arg; ok djm@ - (dtucker) [clientloop.c serverloop.c] channel_register_filter now takes 2 more args. with djm@ - (dtucker) [defines.h] Bug #1112: __dead is, well dead. Based on a patch diff --git a/mux.c b/mux.c index aaa3a4ee..ce3015c3 100644 --- a/mux.c +++ b/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.5 2008/06/13 00:16:49 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.6 2008/06/13 00:47:53 dtucker Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller * @@ -711,7 +711,7 @@ muxclient(const char *path) leave_raw_mode(); if (i > (int)sizeof(int)) fatal("%s: master returned too much data (%d > %lu)", - __func__, i, sizeof(int)); + __func__, i, (u_long)sizeof(int)); if (muxclient_terminate) { debug2("Exiting on signal %d", muxclient_terminate); exitval[0] = 255; -- 2.45.1