Zip Reader: initialise error string earlier.

[pspp] / src / libpspp / inflate.c

diff --git a/src/libpspp/inflate.c b/src/libpspp/inflate.c
index 478747843b743869bd596fd39b97bba85e64cd7b..0396674b1a8b12ecccd5c2d4c088efaaa7af69d2 100644 (file)
--- a/src/libpspp/inflate.c
+++ b/src/libpspp/inflate.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
@@ -19,8 +19,6 @@
 
 #include "inflate.h"
 
-#if HAVE_ZLIB_H
-
 #include <xalloc.h>
 #include <zlib.h>
 #include <stdio.h>
@@ -62,8 +60,8 @@ inflate_init (struct zip_member *zm)
 {
   int r;
   struct inflator *inf = xzalloc (sizeof *inf);
-  
-  uint16_t flg = 0 ; 
+
+  uint16_t flg = 0 ;
   uint16_t cmf = 0x8; /* Always 8 for inflate */
 
   const uint16_t cinfo = 7;  /* log_2(Window size) - 8 */
@@ -86,7 +84,7 @@ inflate_init (struct zip_member *zm)
 
   if ( Z_OK != r)
     {
-      ds_put_format (zm->errs, _("Cannot initialize inflator: %s"), zError (r));
+      ds_put_format (zm->errmsgs, _("Cannot initialize inflator: %s"), zError (r));
       return false;
     }
 
@@ -99,6 +97,7 @@ inflate_init (struct zip_member *zm)
 int
 inflate_read (struct zip_member *zm, void *buf, size_t n)
 {
+  int r;
   struct inflator *inf = zm->aux;
 
   if (inf->zss.avail_in == 0)
@@ -117,7 +116,7 @@ inflate_read (struct zip_member *zm, void *buf, size_t n)
        }
 
       bytes_to_read = zm->comp_size - inf->ucomp_bytes_read;
-      
+
       if (bytes_to_read == 0)
        return 0;
 
@@ -134,15 +133,13 @@ inflate_read (struct zip_member *zm, void *buf, size_t n)
   inf->zss.avail_out = n;
   inf->zss.next_out = buf;
 
-  int r = inflate (&inf->zss, Z_NO_FLUSH);
+  r = inflate (&inf->zss, Z_NO_FLUSH);
   if ( Z_OK == r)
     {
       return n - inf->zss.avail_out;
     }
-  
-  ds_put_format (zm->errs, _("Error inflating: %s"), zError (r));
+
+  ds_put_format (zm->errmsgs, _("Error inflating: %s"), zError (r));
 
   return -1;
 }
-
-#endif