X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fzip-reader.c;h=34905b9fb2cc2e9ab40ee0e0932c8127d4013a7e;hb=c715c0e2985569be39d5eacb23fd00dcfbd9f393;hp=3f1d277c92ab140e19653e4383a116bdeb86c1d8;hpb=f1218b6460fe5bd8bbece4f6f5a5262b3bce4c8f;p=pspp

diff --git a/src/libpspp/zip-reader.c b/src/libpspp/zip-reader.c
index 3f1d277c92..34905b9fb2 100644
--- a/src/libpspp/zip-reader.c
+++ b/src/libpspp/zip-reader.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011, 2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -65,9 +65,7 @@ stored_finish (struct zip_member *zm UNUSED)
 static struct decompressor decompressors[n_COMPRESSION] = 
   {
     {stored_init, stored_read, stored_finish},
-#if HAVE_ZLIB_H
     {inflate_init, inflate_read, inflate_finish}
-#endif
   };
 
 static enum compression
@@ -79,11 +77,9 @@ comp_code (struct zip_member *zm, uint16_t c)
     case 0:
       which = COMPRESSION_STORED;
       break;
-#if HAVE_ZLIB_H
     case 8:
       which = COMPRESSION_INFLATE;
       break;
-#endif
     default:
       ds_put_format (zm->errs, _("Unsupported compression type (%d)"), c);
       which = n_COMPRESSION;
@@ -126,9 +122,7 @@ zip_reader_destroy (struct zip_reader *zr)
   if (zr == NULL) 
     return;
 
-  if (zr->fr != NULL)
-    fclose (zr->fr);
-
+  fclose (zr->fr);
   free (zr->filename);
 
   for (i = 0; i < zr->n_members; ++i)