- dtucker@cvs.openbsd.org 2008/06/13 00:47:53

     [mux.c]
     upcast size_t to u_long to match format arg; ok djm@

diff --git a/ChangeLog b/ChangeLog
index 5f57930d7859c3732a4f7a70ef21e6abc060e0e0..0dc6d7405b739929710c188f9a410ab77666661a 100644 (file)
--- 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 aaa3a4ee29a1519b86c1b2ac24667be24657273a..ce3015c3fc9150e95ab67866244dbfe723a3f6ba 100644 (file)
--- 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 <djm@openbsd.org>
  *
@@ -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;