From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ramsay Jones Subject: [PATCH] http: fix some printf format warnings on 32-bit builds Date: Wed, 11 Nov 2015 00:23:06 +0000 Message-ID: <56428A6A.5010406@ramsayjones.plus.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: Junio C Hamano , GIT Mailing-list To: Jeff King X-From: git-owner@vger.kernel.org Wed Nov 11 01:23:29 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZwJC6-0005oM-4r for gcvg-git-2@plane.gmane.org; Wed, 11 Nov 2015 01:23:22 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751957AbbKKAXS (ORCPT ); Tue, 10 Nov 2015 19:23:18 -0500 Received: from avasout01.plus.net ([84.93.230.227]:58433 "EHLO avasout01.plus.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751707AbbKKAXR (ORCPT ); Tue, 10 Nov 2015 19:23:17 -0500 Received: from [10.0.2.15] ([146.199.93.105]) by avasout01 with smtp id g0PD1r0012GQ2gJ010PEea; Wed, 11 Nov 2015 00:23:14 +0000 X-CM-Score: 0.00 X-CNFS-Analysis: v=2.1 cv=MbeRwMLf c=1 sm=1 tr=0 a=SWxm+s7FAPvPP0IAAWI2og==:117 a=SWxm+s7FAPvPP0IAAWI2og==:17 a=0Bzu9jTXAAAA:8 a=EBOSESyhAAAA:8 a=IkcTkHD0fZMA:10 a=rh0_XBnAZPvfIqi7OQMA:9 a=QEXdDO2ut3YA:10 X-AUTH: ramsayjones@:2500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Commit f8117f55 ("http: use off_t to store partial file size", 02-11-2015) changed the type of some variables from long to off_t. The 32-bit build, which enables the large filesystem interface (_FILE_OFFSET_BITS == 64), defines the off_t type as a 64-bit integer, whereas long is a 32-bit integer. This results in a couple of printf format warnings. In order to suppress the warnings, change the format specifier to use the PRIuMAX macro and cast the off_t argument to uintmax_t. (See also the http_opt_request_remainder() function, which uses the same solution). Signed-off-by: Ramsay Jones --- Hi Jeff, I don't compile on 32-bit as often as I did in the past, otherwise I would have noticed this sooner. :( ATB, Ramsay Jones http.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/http.c b/http.c index 42f29ce..2532976 100644 --- a/http.c +++ b/http.c @@ -1617,8 +1617,8 @@ struct http_pack_request *new_http_pack_request( if (prev_posn>0) { if (http_is_verbose) fprintf(stderr, - "Resuming fetch of pack %s at byte %ld\n", - sha1_to_hex(target->sha1), prev_posn); + "Resuming fetch of pack %s at byte %"PRIuMAX"\n", + sha1_to_hex(target->sha1), (uintmax_t)prev_posn); http_opt_request_remainder(preq->slot->curl, prev_posn); } @@ -1772,8 +1772,8 @@ struct http_object_request *new_http_object_request(const char *base_url, if (prev_posn>0) { if (http_is_verbose) fprintf(stderr, - "Resuming fetch of object %s at byte %ld\n", - hex, prev_posn); + "Resuming fetch of object %s at byte %"PRIuMAX"\n", + hex, (uintmax_t)prev_posn); http_opt_request_remainder(freq->slot->curl, prev_posn); } -- 2.6.0