From owner-svn-src-head@FreeBSD.ORG Thu Dec 16 19:48:03 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF6C310656EA; Thu, 16 Dec 2010 19:48:03 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BE7358FC1D; Thu, 16 Dec 2010 19:48:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBGJm3Xs080159; Thu, 16 Dec 2010 19:48:03 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBGJm3A5080157; Thu, 16 Dec 2010 19:48:03 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201012161948.oBGJm3A5080157@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Thu, 16 Dec 2010 19:48:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216494 - head/sbin/hastd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Dec 2010 19:48:03 -0000 Author: pjd Date: Thu Dec 16 19:48:03 2010 New Revision: 216494 URL: http://svn.freebsd.org/changeset/base/216494 Log: The 'ret' variable is of type ssize_t and we use proper format for it (%zd), so no (bogus) cast is needed. MFC after: 3 days Modified: head/sbin/hastd/primary.c Modified: head/sbin/hastd/primary.c ============================================================================== --- head/sbin/hastd/primary.c Thu Dec 16 17:54:56 2010 (r216493) +++ head/sbin/hastd/primary.c Thu Dec 16 19:48:03 2010 (r216494) @@ -1142,8 +1142,7 @@ local_send_thread(void *arg) } else if (ret != ggio->gctl_length) { reqlog(LOG_WARNING, 0, ggio, "Local request failed (%zd != %jd), trying remote node. ", - (intmax_t)ret, - (intmax_t)ggio->gctl_length); + ret, (intmax_t)ggio->gctl_length); } QUEUE_INSERT1(hio, send, rncomp); continue; @@ -1162,7 +1161,7 @@ local_send_thread(void *arg) hio->hio_errors[ncomp] = EIO; reqlog(LOG_WARNING, 0, ggio, "Local request failed (%zd != %jd): ", - (intmax_t)ret, (intmax_t)ggio->gctl_length); + ret, (intmax_t)ggio->gctl_length); } else { hio->hio_errors[ncomp] = 0; }