projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow totals to have different statistics
[pspp]
/
src
/
libpspp
/
zip-reader.c
diff --git
a/src/libpspp/zip-reader.c
b/src/libpspp/zip-reader.c
index b28ac75f8ba4e93c846f3227ab32e283f9013cd3..00249e0bae41be64128720410c0079c7e819a230 100644
(file)
--- a/
src/libpspp/zip-reader.c
+++ b/
src/libpspp/zip-reader.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2011, 2013, 2014 Free Software Foundation, Inc.
+ Copyright (C) 2011, 2013, 2014
, 2021
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
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
@@
-378,7
+378,7
@@
zip_reader_create (const char *file_name, struct zip_reader **zrp)
return NULL;
}
return NULL;
}
- struct zip_reader *zr =
xzalloc (sizeof *z
r);
+ struct zip_reader *zr =
XZALLOC (struct zip_reade
r);
zr->ref_cnt = 1;
zr->file_name = xstrdup (file_name);
zr->entries = xcalloc (n_members, sizeof *zr->entries);
zr->ref_cnt = 1;
zr->file_name = xstrdup (file_name);
zr->entries = xcalloc (n_members, sizeof *zr->entries);
@@
-577,7
+577,7
@@
probe_magic (FILE *fp, uint32_t magic, off_t start, off_t stop, off_t *off)
if (0 > fseeko (fp, start, SEEK_SET))
{
if (0 > fseeko (fp, start, SEEK_SET))
{
- return
-1
;
+ return
false
;
}
for (i = 0; i < 4 ; ++i)
}
for (i = 0; i < 4 ; ++i)
@@
-668,7
+668,7
@@
static char *
inflate_init (struct zip_member *zm)
{
int r;
inflate_init (struct zip_member *zm)
{
int r;
- struct inflator *inf =
xzalloc (sizeof *inf
);
+ struct inflator *inf =
XZALLOC (struct inflator
);
uint16_t flg = 0 ;
uint16_t cmf = 0x8; /* Always 8 for inflate */
uint16_t flg = 0 ;
uint16_t cmf = 0x8; /* Always 8 for inflate */