From 7ad17dcd901543818f21f80209f30f81355e98d1 Mon Sep 17 00:00:00 2001 From: Gerhard Rieger Date: Fri, 3 Apr 2015 15:32:59 +0200 Subject: [PATCH] Fixed Debug arguments issue in _socat() --- CHANGES | 2 ++ xioengine.c | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 5aa936f..f517a66 100644 --- a/CHANGES +++ b/CHANGES @@ -245,6 +245,8 @@ corrections: Options shut-none, shut-down, shut-close all might not have worked correctly. Thanks to Ray Song for reporting this issue. + Fixed Debug arguments issue in _socat() + porting: Red Hat issue 1020203: configure checks fail with some compilers. Use case: clang diff --git a/xioengine.c b/xioengine.c index c186078..f6fd7dc 100644 --- a/xioengine.c +++ b/xioengine.c @@ -137,12 +137,10 @@ int _socat(xiofile_t *xfd1, xiofile_t *xfd2) { XIO_RDSTREAM(sock2)->eof <= 1) { struct timeval timeout, *to = NULL; - Debug4("data loop: sock1->eof=%d, sock2->eof=%d, 1->closing=%d, 2->closing=%d, wasaction=%d, total_to={"F_tv_sec"."F_tv_usec"}", + Debug7("data loop: sock1->eof=%d, sock2->eof=%d, 1->closing=%d, 2->closing=%d, wasaction=%d, total_to={"F_tv_sec"."F_tv_usec"}", XIO_RDSTREAM(sock1)->eof, XIO_RDSTREAM(sock2)->eof, - sock1->stream.closing, sock2->stream.closing); - Debug6("wasaction=%d, total_to={"F_tv_sec"."F_tv_usec"}", - wasaction, total_timeout.tv_sec, total_timeout.tv_usec, wasaction, - total_timeout.tv_sec, total_timeout.tv_usec); + sock1->stream.closing, sock2->stream.closing, + wasaction, total_timeout.tv_sec, total_timeout.tv_usec); /* for ignoreeof */ if (polling) {