From owner-svn-ports-head@FreeBSD.ORG Thu Jan 22 22:08:59 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 388DFD5D; Thu, 22 Jan 2015 22:08:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0BB8FC58; Thu, 22 Jan 2015 22:08:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0MM8wNE039487; Thu, 22 Jan 2015 22:08:58 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0MM8wb1039486; Thu, 22 Jan 2015 22:08:58 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201501222208.t0MM8wb1039486@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Thu, 22 Jan 2015 22:08:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377699 - head/net/libutp/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jan 2015 22:08:59 -0000 Author: mi Date: Thu Jan 22 22:08:58 2015 New Revision: 377699 URL: https://svnweb.freebsd.org/changeset/ports/377699 QAT: https://qat.redports.org/buildarchive/r377699/ Log: Add a patch to fix 64-bit specific warnings in the just-added utilities. PR: 197009 Submitted by: Jan Beich Added: head/net/libutp/files/patch-size_t (contents, props changed) Added: head/net/libutp/files/patch-size_t ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libutp/files/patch-size_t Thu Jan 22 22:08:58 2015 (r377699) @@ -0,0 +1,54 @@ +--- utp_file/utp_recv.cpp 2013-05-14 19:05:36.000000000 -0400 ++++ utp_file/utp_recv.cpp 2015-01-22 16:45:03.000000000 -0500 +@@ -82,5 +82,5 @@ + UTPSocket *utp_socket = NULL; + FILE *file = NULL; +-size_t total_recv = 0; ++intmax_t total_recv = 0; + bool no_connection = true; + +@@ -205,5 +205,5 @@ + { + assert(utp_socket == socket); +- printf("utp on_write %u\n", count); ++ printf("utp on_write %zu\n", count); + assert(false); + } +@@ -365,10 +365,10 @@ + last_recv = total_recv; + last_time = cur_time; +- printf("\r[%u] recv: %d %.1f bytes/s ", cur_time, total_recv, rate); ++ printf("\r[%u] recv: %jd %.1f bytes/s ", cur_time, total_recv, rate); + fflush(stdout); + } + } + +- printf("\nreceived: %d bytes\n", total_recv); ++ printf("\nreceived: %jd bytes\n", (intmax_t)total_recv); + fclose(file); + fclose(log_file); +--- utp_file/utp_send.cpp 2013-05-14 19:05:36.000000000 -0400 ++++ utp_file/utp_send.cpp 2015-01-22 16:45:03.000000000 -0500 +@@ -82,6 +82,6 @@ + UTPSocket *utp_socket = NULL; + FILE *file = NULL; +-size_t total_sent = 0; +-size_t file_size = 0; ++intmax_t total_sent = 0; ++intmax_t file_size = 0; + + void utp_log(char const* fmt, ...) +@@ -252,5 +252,5 @@ + { + assert(utp_socket == socket); +- printf("utp on_read %u\n", count); ++ printf("utp on_read %zu\n", count); + assert(false); + } +@@ -392,5 +392,5 @@ + last_sent = total_sent; + last_time = cur_time; +- printf("\r[%u] sent: %d/%d %.1f bytes/s ", cur_time, total_sent, file_size, rate); ++ printf("\r[%u] sent: %jd/%jd %.1f bytes/s ", cur_time, total_sent, file_size, rate); + fflush(stdout); + }