From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 494FC208C4 for ; Sat, 12 Aug 2017 13:51:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751127AbdHLNvR (ORCPT ); Sat, 12 Aug 2017 09:51:17 -0400 Received: from avasout05.plus.net ([84.93.230.250]:56513 "EHLO avasout05.plus.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750983AbdHLNvQ (ORCPT ); Sat, 12 Aug 2017 09:51:16 -0400 Received: from [10.0.2.15] ([143.159.212.52]) by avasout05 with smtp id wDrE1v00918PUFB01DrFiR; Sat, 12 Aug 2017 14:51:15 +0100 X-CM-Score: 0.00 X-CNFS-Analysis: v=2.2 cv=Iav3YSia c=1 sm=1 tr=0 a=CKmocqUIrzA4K3l9YJ19NQ==:117 a=CKmocqUIrzA4K3l9YJ19NQ==:17 a=IkcTkHD0fZMA:10 a=FQcsDvbEE3GYX54BhYsA:9 a=QEXdDO2ut3YA:10 X-AUTH: ramsayjones@:2500 Subject: Re: [PATCH 2/9] Convert index-pack to size_t To: Martin Koegler , git@vger.kernel.org, gitster@pobox.com, Johannes.Schindelin@gmx.de References: <1502527643-21944-1-git-send-email-martin@mail.zuhause> <1502527643-21944-2-git-send-email-martin@mail.zuhause> From: Ramsay Jones Message-ID: <0f19234c-524e-7d93-4700-c44aa1e6f3a6@ramsayjones.plus.com> Date: Sat, 12 Aug 2017 14:51:13 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <1502527643-21944-2-git-send-email-martin@mail.zuhause> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 12/08/17 09:47, Martin Koegler wrote: > From: Martin Koegler > > Signed-off-by: Martin Koegler > --- > builtin/index-pack.c | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git a/builtin/index-pack.c b/builtin/index-pack.c > index 7f3ccd0..bf2d728 100644 > --- a/builtin/index-pack.c > +++ b/builtin/index-pack.c > @@ -435,7 +435,7 @@ static int is_delta_type(enum object_type type) > return (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA); > } > > -static void *unpack_entry_data(off_t offset, unsigned long size, > +static void *unpack_entry_data(off_t offset, size_t size, > enum object_type type, unsigned char *sha1) > { > static char fixed_buf[8192]; > @@ -444,10 +444,10 @@ static void *unpack_entry_data(off_t offset, unsigned long size, > void *buf; > git_SHA_CTX c; > char hdr[32]; > - int hdrlen; > + size_t hdrlen; > > if (!is_delta_type(type)) { > - hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", typename(type), size) + 1; > + hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %" PRIuMAX, typename(type), (uintmax_t)size) + 1; > git_SHA1_Init(&c); > git_SHA1_Update(&c, hdr, hdrlen); > } else > @@ -489,7 +489,7 @@ static void *unpack_raw_entry(struct object_entry *obj, > unsigned char *sha1) > { > unsigned char *p; > - unsigned long size, c; > + size_t size, c; > off_t base_offset; > unsigned shift; > void *data; > @@ -551,11 +551,11 @@ static void *unpack_raw_entry(struct object_entry *obj, > } > > static void *unpack_data(struct object_entry *obj, > - int (*consume)(const unsigned char *, unsigned long, void *), > + int (*consume)(const unsigned char *, size_t, void *), > void *cb_data) > { > off_t from = obj[0].idx.offset + obj[0].hdr_size; > - off_t len = obj[1].idx.offset - from; > + size_t len = obj[1].idx.offset - from; Similar comment to previous patch. ATB, Ramsay Jones