From e7b56250b424b30711dfb1ba1756c93391db2678 Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Thu, 9 Dec 2004 16:22:32 +0000
Subject: [PATCH] Fix portability problesm
git-svn-id: http://root.cern.ch/svn/root/trunk@10739 27541ba8-7e3a-0410-8455-c3a389f83636
---
zip/inc/Bits.h | 9 ++++-----
zip/src/ZInflate.c | 4 ++--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/zip/inc/Bits.h b/zip/inc/Bits.h
index e0a9e765c73..a3936d907bd 100644
--- a/zip/inc/Bits.h
+++ b/zip/inc/Bits.h
@@ -1,4 +1,4 @@
-/* @(#)root/zip:$Name: $:$Id: Bits.h,v 1.5 2004/12/09 15:40:46 brun Exp $ */
+/* @(#)root/zip:$Name: $:$Id: Bits.h,v 1.6 2004/12/09 15:56:59 brun Exp $ */
/* Author: */
/*
@@ -406,10 +406,11 @@ void R__zip(int cxlevel, int *srcsize, char *src, int *tgtsize, char *tgt, int *
/* char *tgt, *src; source and target buffers */
{
+ int err;
+ int method = Z_DEFLATED;
+
if (R__ZipMode != 0) {
z_stream stream;
- int err;
-
*irep = 0;
error_flag = 0;
@@ -418,7 +419,6 @@ void R__zip(int cxlevel, int *srcsize, char *src, int *tgtsize, char *tgt, int *
if (*srcsize > 0xffffff) R__error("source buffer too big");
if (error_flag != 0) return;
- int method = Z_DEFLATED;
stream.next_in = (Bytef*)src;
stream.avail_in = (uInt)(*srcsize);
@@ -463,7 +463,6 @@ void R__zip(int cxlevel, int *srcsize, char *src, int *tgtsize, char *tgt, int *
} else {
ush att = (ush)UNKNOWN;
ush flags = 0;
- int method = Z_DEFLATED;
level = cxlevel;
*irep = 0;
diff --git a/zip/src/ZInflate.c b/zip/src/ZInflate.c
index b3fae37db0b..3bb2705ee43 100644
--- a/zip/src/ZInflate.c
+++ b/zip/src/ZInflate.c
@@ -1,4 +1,4 @@
-/* @(#)root/zip:$Name: $:$Id: ZInflate.c,v 1.4 2004/12/09 15:40:46 brun Exp $ */
+/* @(#)root/zip:$Name: $:$Id: ZInflate.c,v 1.5 2004/12/09 15:56:59 brun Exp $ */
/* Author: */
#include <stdio.h>
#include <stdlib.h>
@@ -1168,7 +1168,7 @@ void R__unzip(int *srcsize, uch *src, int *tgtsize, uch *tgt, int *irep)
/* New zlib format */
if (src[0] == 'Z' && src[1] == 'L') {
- z_stream stream; // decompression stream
+ z_stream stream; /* decompression stream */
int err = 0;
stream.next_in = (Bytef*)(&src[HDRSIZE]);
--
GitLab