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=-2.7 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD shortcircuit=no autolearn=no 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 1DCC41F667 for ; Sat, 12 Aug 2017 08:47:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751155AbdHLIra (ORCPT ); Sat, 12 Aug 2017 04:47:30 -0400 Received: from vie01a-dmta-pe04-3.mx.upcmail.net ([62.179.121.165]:20032 "EHLO vie01a-dmta-pe04-3.mx.upcmail.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750980AbdHLIr3 (ORCPT ); Sat, 12 Aug 2017 04:47:29 -0400 Received: from [172.31.216.44] (helo=vie01a-pemc-psmtp-pe02) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dgS4t-0001Pl-8E for git@vger.kernel.org; Sat, 12 Aug 2017 10:47:27 +0200 Received: from master.zuhause ([80.108.242.240]) by vie01a-pemc-psmtp-pe02 with SMTP @ mailcloud.upcmail.net id w8nS1v00P5BuuEg018nTx5; Sat, 12 Aug 2017 10:47:27 +0200 X-SourceIP: 80.108.242.240 Received: by master.zuhause (Postfix, from userid 1006) id 1660A45D4512; Sat, 12 Aug 2017 10:47:26 +0200 (CEST) From: Martin Koegler To: git@vger.kernel.org, gitster@pobox.com, Johannes.Schindelin@gmx.de Cc: Martin Koegler Subject: [PATCH 4/9] Convert archive functions to size_t Date: Sat, 12 Aug 2017 10:47:18 +0200 Message-Id: <1502527643-21944-4-git-send-email-martin@mail.zuhause> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1502527643-21944-1-git-send-email-martin@mail.zuhause> References: <1502527643-21944-1-git-send-email-martin@mail.zuhause> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Martin Koegler --- archive-tar.c | 16 ++++++++-------- archive-zip.c | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/archive-tar.c b/archive-tar.c index 719673d..ee56b2b 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -12,7 +12,7 @@ #define BLOCKSIZE (RECORDSIZE * 20) static char block[BLOCKSIZE]; -static unsigned long offset; +static size_t offset; static int tar_umask = 002; @@ -50,12 +50,12 @@ static void write_if_needed(void) * queues up writes, so that all our write(2) calls write exactly one * full block; pads writes to RECORDSIZE */ -static void do_write_blocked(const void *data, unsigned long size) +static void do_write_blocked(const void *data, size_t size) { const char *buf = data; if (offset) { - unsigned long chunk = BLOCKSIZE - offset; + size_t chunk = BLOCKSIZE - offset; if (size < chunk) chunk = size; memcpy(block + offset, buf, chunk); @@ -77,7 +77,7 @@ static void do_write_blocked(const void *data, unsigned long size) static void finish_record(void) { - unsigned long tail; + size_t tail; tail = offset % RECORDSIZE; if (tail) { memset(block + offset, 0, RECORDSIZE - tail); @@ -86,7 +86,7 @@ static void finish_record(void) write_if_needed(); } -static void write_blocked(const void *data, unsigned long size) +static void write_blocked(const void *data, size_t size) { do_write_blocked(data, size); finish_record(); @@ -198,10 +198,10 @@ static size_t get_path_prefix(const char *path, size_t pathlen, size_t maxlen) static void prepare_header(struct archiver_args *args, struct ustar_header *header, - unsigned int mode, unsigned long size) + unsigned int mode, size_t size) { xsnprintf(header->mode, sizeof(header->mode), "%07o", mode & 07777); - xsnprintf(header->size, sizeof(header->size), "%011lo", S_ISREG(mode) ? size : 0); + xsnprintf(header->size, sizeof(header->size), "%011lo", S_ISREG(mode) ? (unsigned long)size : 0); xsnprintf(header->mtime, sizeof(header->mtime), "%011lo", (unsigned long) args->time); xsnprintf(header->uid, sizeof(header->uid), "%07o", 0); @@ -219,7 +219,7 @@ static void prepare_header(struct archiver_args *args, static void write_extended_header(struct archiver_args *args, const unsigned char *sha1, - const void *buffer, unsigned long size) + const void *buffer, size_t size) { struct ustar_header header; unsigned int mode; diff --git a/archive-zip.c b/archive-zip.c index 4492d64..3a54d80 100644 --- a/archive-zip.c +++ b/archive-zip.c @@ -186,12 +186,12 @@ static uint32_t clamp32(uintmax_t n) return (n < max) ? n : max; } -static void *zlib_deflate_raw(void *data, unsigned long size, +static void *zlib_deflate_raw(void *data, size_t size, int compression_level, - unsigned long *compressed_size) + size_t *compressed_size) { git_zstream stream; - unsigned long maxsize; + size_t maxsize; void *buffer; int result; @@ -219,9 +219,9 @@ static void *zlib_deflate_raw(void *data, unsigned long size, return buffer; } -static void write_zip_data_desc(unsigned long size, - unsigned long compressed_size, - unsigned long crc) +static void write_zip_data_desc(size_t size, + size_t compressed_size, + uint32_t crc) { if (size >= 0xffffffff || compressed_size >= 0xffffffff) { struct zip64_data_desc trailer; @@ -243,9 +243,9 @@ static void write_zip_data_desc(unsigned long size, } static void set_zip_header_data_desc(struct zip_local_header *header, - unsigned long size, - unsigned long compressed_size, - unsigned long crc) + size_t size, + size_t compressed_size, + uint32_t crc) { copy_le32(header->crc32, crc); copy_le32(header->compressed_size, compressed_size); @@ -287,8 +287,8 @@ static int write_zip_entry(struct archiver_args *args, size_t header_extra_size = ZIP_EXTRA_MTIME_SIZE; int need_zip64_extra = 0; unsigned long attr2; - unsigned long compressed_size; - unsigned long crc; + size_t compressed_size; + uint32_t crc; int method; unsigned char *out; void *deflated = NULL; -- 2.1.4