- fix signed/unsigned comparisions
- cast malloc return value
--HG--
branch : HEAD
diff --git a/lib/zip_close.c b/lib/zip_close.c
index f3b6046..1482ae0 100644
--- a/lib/zip_close.c
+++ b/lib/zip_close.c
@@ -1,5 +1,5 @@
/*
- $NiH: zip_close.c,v 1.51 2005/06/18 00:54:08 wiz Exp $
+ $NiH: zip_close.c,v 1.52 2006/02/21 09:13:32 dillo Exp $
zip_close.c -- close zip archive and update changes
Copyright (C) 1999, 2004, 2005 Dieter Baron and Thomas Klausner
@@ -95,7 +95,7 @@
if ((cd=_zip_cdir_new(survivors, &za->error)) == NULL)
return -1;
- if ((temp=malloc(strlen(za->zn)+8)) == NULL) {
+ if ((temp=(char *)malloc(strlen(za->zn)+8)) == NULL) {
_zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
_zip_cdir_free(cd);
return -1;
@@ -249,7 +249,7 @@
cb = za->entry[idx].source->f;
ud = za->entry[idx].source->ud;
- if (cb(ud, &st, sizeof(st), ZIP_SOURCE_STAT) < sizeof(st)) {
+ if (cb(ud, &st, sizeof(st), ZIP_SOURCE_STAT) < (ssize_t)sizeof(st)) {
ch_set_error(&za->error, cb, ud);
return -1;
}
@@ -412,7 +412,7 @@
{
int e[2];
- if ((cb(ud, e, sizeof(e), ZIP_SOURCE_ERROR)) < sizeof(e)) {
+ if ((cb(ud, e, sizeof(e), ZIP_SOURCE_ERROR)) < (ssize_t)sizeof(e)) {
error->zip_err = ZIP_ER_INTERNAL;
error->sys_err = 0;
}
diff --git a/lib/zip_dirent.c b/lib/zip_dirent.c
index 70ebf63..2eb0623 100644
--- a/lib/zip_dirent.c
+++ b/lib/zip_dirent.c
@@ -1,5 +1,5 @@
/*
- $NiH: zip_dirent.c,v 1.6 2005/06/09 19:57:09 dillo Exp $
+ $NiH: zip_dirent.c,v 1.7 2005/06/18 00:54:08 wiz Exp $
zip_dirent.c -- read directory entry (local or central), clean dirent
Copyright (C) 1999, 2003, 2004, 2005 Dieter Baron and Thomas Klausner
@@ -49,7 +49,7 @@
static time_t _zip_d2u_time(int, int);
static char *_zip_readfpstr(FILE *, unsigned int, int, struct zip_error *);
static char *_zip_readstr(unsigned char **, int, int, struct zip_error *);
-static void _zip_u2d_time(time_t, int *, int *);
+static void _zip_u2d_time(time_t, unsigned short *, unsigned short *);
static void _zip_write2(unsigned short, FILE *);
static void _zip_write4(unsigned int, FILE *);
@@ -77,12 +77,13 @@
{
struct zip_cdir *cd;
- if ((cd=malloc(sizeof(*cd))) == NULL) {
+ if ((cd=(struct zip_cdir *)malloc(sizeof(*cd))) == NULL) {
_zip_error_set(error, ZIP_ER_MEMORY, 0);
return NULL;
}
- if ((cd->entry=malloc(sizeof(*(cd->entry))*nentry)) == NULL) {
+ if ((cd->entry=(struct zip_dirent *)malloc(sizeof(*(cd->entry))*nentry))
+ == NULL) {
_zip_error_set(error, ZIP_ER_MEMORY, 0);
free(cd);
return NULL;
@@ -117,8 +118,8 @@
/* clearerr(fp); */
fwrite(EOCD_MAGIC, 1, 4, fp);
_zip_write4(0, fp);
- _zip_write2(cd->nentry, fp);
- _zip_write2(cd->nentry, fp);
+ _zip_write2((unsigned short)cd->nentry, fp);
+ _zip_write2((unsigned short)cd->nentry, fp);
_zip_write4(cd->size, fp);
_zip_write4(cd->offset, fp);
_zip_write2(cd->comment_len, fp);
@@ -335,7 +336,7 @@
_zip_dirent_write(struct zip_dirent *zde, FILE *fp, int localp,
struct zip_error *error)
{
- int dostime, dosdate;
+ unsigned short dostime, dosdate;
fwrite(localp ? LOCAL_MAGIC : CENTRAL_MAGIC, 1, 4, fp);
@@ -438,7 +439,7 @@
{
char *r, *o;
- r = (char *)malloc(nulp?len+1:len);
+ r = (char *)malloc(nulp ? len+1 : len);
if (!r) {
_zip_error_set(error, ZIP_ER_MEMORY, 0);
return NULL;
@@ -468,7 +469,7 @@
{
char *r, *o;
- r = (char *)malloc(nulp?len+1:len);
+ r = (char *)malloc(nulp ? len+1 : len);
if (!r) {
_zip_error_set(error, ZIP_ER_MEMORY, 0);
return NULL;
@@ -515,7 +516,7 @@
static void
-_zip_u2d_time(time_t time, int *dtime, int *ddate)
+_zip_u2d_time(time_t time, unsigned short *dtime, unsigned short *ddate)
{
struct tm *tm;
diff --git a/lib/zip_error_strerror.c b/lib/zip_error_strerror.c
index 90c56a1..6e726a2 100644
--- a/lib/zip_error_strerror.c
+++ b/lib/zip_error_strerror.c
@@ -1,5 +1,5 @@
/*
- $NiH: zip_error_strerror.c,v 1.2 2003/10/06 02:50:06 dillo Exp $
+ $NiH: zip_error_strerror.c,v 1.3 2004/11/17 21:55:11 wiz Exp $
zip_error_sterror.c -- get string representation of struct zip_error
Copyright (C) 1999, 2003 Dieter Baron and Thomas Klausner
@@ -78,7 +78,8 @@
if (ss == NULL)
return zs;
else {
- if ((s=malloc(strlen(ss) + (zs ? strlen(zs)+2 : 0) + 1)) == NULL)
+ if ((s=(char *)malloc(strlen(ss)
+ + (zs ? strlen(zs)+2 : 0) + 1)) == NULL)
return _zip_err_str[ZIP_ER_MEMORY];
sprintf(s, "%s%s%s",
diff --git a/lib/zip_fread.c b/lib/zip_fread.c
index f3402c5..0df56ca 100644
--- a/lib/zip_fread.c
+++ b/lib/zip_fread.c
@@ -1,5 +1,5 @@
/*
- $NiH: zip_fread.c,v 1.17 2005/06/18 00:54:08 wiz Exp $
+ $NiH: zip_fread.c,v 1.18 2005/07/14 16:20:56 wiz Exp $
zip_fread.c -- read from file
Copyright (C) 1999, 2004, 2005 Dieter Baron and Thomas Klausner
@@ -43,8 +43,8 @@
ssize_t
zip_fread(struct zip_file *zf, void *outbuf, size_t toread)
{
- int out_before, ret;
- int len;
+ int ret;
+ size_t out_before, len;
if (!zf)
return -1;
diff --git a/lib/zip_open.c b/lib/zip_open.c
index 68ee9bc..7b7f050 100644
--- a/lib/zip_open.c
+++ b/lib/zip_open.c
@@ -1,5 +1,5 @@
/*
- $NiH: zip_open.c,v 1.29 2005/05/18 21:19:37 wiz Exp $
+ $NiH: zip_open.c,v 1.30 2005/06/09 19:57:10 dillo Exp $
zip_open.c -- open zip archive
Copyright (C) 1999, 2003, 2004, 2005 Dieter Baron and Thomas Klausner
@@ -194,7 +194,8 @@
return NULL;
}
- if ((za->entry=malloc(sizeof(*(za->entry))*cdir->nentry)) == NULL) {
+ if ((za->entry=(struct zip_entry *)malloc(sizeof(*(za->entry))
+ * cdir->nentry)) == NULL) {
set_error(zep, NULL, ZIP_ER_MEMORY);
_zip_free(za);
return NULL;
@@ -289,7 +290,7 @@
}
cdp = eocd;
- if (cd->size < eocd-buf) {
+ if (cd->size < (unsigned int)(eocd-buf)) {
/* if buffer already read in, use it */
cdp = eocd - cd->size;
bufp = &cdp;
@@ -299,7 +300,7 @@
bufp = NULL;
clearerr(fp);
fseek(fp, -(cd->size+cd->comment_len+EOCDLEN), SEEK_END);
- if (ferror(fp) || (ftell(fp) != cd->offset)) {
+ if (ferror(fp) || ((unsigned int)ftell(fp) != cd->offset)) {
/* seek error or offset of cdir wrong */
if (ferror(fp))
_zip_error_set(error, ZIP_ER_SEEK, errno);
@@ -333,7 +334,8 @@
static int
_zip_checkcons(FILE *fp, struct zip_cdir *cd, struct zip_error *error)
{
- int min, max, i, j;
+ int i;
+ unsigned int min, max, j;
struct zip_dirent temp;
if (cd->nentry) {
diff --git a/lib/zip_source_buffer.c b/lib/zip_source_buffer.c
index b277635..fd3bfe1 100644
--- a/lib/zip_source_buffer.c
+++ b/lib/zip_source_buffer.c
@@ -1,5 +1,5 @@
/*
- $NiH: zip_source_buffer.c,v 1.4 2005/05/20 21:54:12 wiz Exp $
+ $NiH: zip_source_buffer.c,v 1.5 2005/06/09 19:57:10 dillo Exp $
zip_source_buffer.c -- create zip data source from buffer
Copyright (C) 1999, 2003, 2004, 2005 Dieter Baron and Thomas Klausner
@@ -66,7 +66,7 @@
return NULL;
}
- if ((f=malloc(sizeof(*f))) == NULL) {
+ if ((f=(struct read_data *)malloc(sizeof(*f))) == NULL) {
_zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
return NULL;
}
@@ -91,7 +91,7 @@
{
struct read_data *z;
char *buf;
- int n;
+ size_t n;
z = (struct read_data *)state;
buf = (char *)data;
diff --git a/lib/zip_source_function.c b/lib/zip_source_function.c
index d6bb799..d8f9297 100644
--- a/lib/zip_source_function.c
+++ b/lib/zip_source_function.c
@@ -1,5 +1,5 @@
/*
- $NiH: zip_source_function.c,v 1.2 2004/11/18 16:28:13 wiz Exp $
+ $NiH: zip_source_function.c,v 1.3 2004/12/22 16:32:00 dillo Exp $
zip_source_function.c -- create zip data source from callback function
Copyright (C) 1999, 2003, 2004 Dieter Baron and Thomas Klausner
@@ -50,7 +50,7 @@
if (za == NULL)
return NULL;
- if ((zs=malloc(sizeof(*zs))) == NULL) {
+ if ((zs=(struct zip_source *)malloc(sizeof(*zs))) == NULL) {
_zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
return NULL;
}
diff --git a/lib/zip_source_zip.c b/lib/zip_source_zip.c
index f5ad013..5cfdf3d 100644
--- a/lib/zip_source_zip.c
+++ b/lib/zip_source_zip.c
@@ -1,5 +1,5 @@
/*
- $NiH: zip_source_zip.c,v 1.5 2005/06/09 19:11:05 dillo Exp $
+ $NiH: zip_source_zip.c,v 1.6 2005/06/09 19:57:10 dillo Exp $
zip_source_zip.c -- create data source from zip file
Copyright (C) 1999, 2003, 2004, 2005 Dieter Baron and Thomas Klausner
@@ -82,7 +82,7 @@
else
flags &= ~ZIP_FL_COMPRESSED;
- if ((p=malloc(sizeof(*p))) == NULL) {
+ if ((p=(struct read_zip *)malloc(sizeof(*p))) == NULL) {
_zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
return NULL;
}
diff --git a/lib/zipint.h b/lib/zipint.h
index 1e7f174..367ae8f 100644
--- a/lib/zipint.h
+++ b/lib/zipint.h
@@ -2,7 +2,7 @@
#define _HAD_ZIPINT_H
/*
- $NiH: zipint.h,v 1.41 2005/06/18 00:54:08 wiz Exp $
+ $NiH: zipint.h,v 1.42 2005/09/06 23:44:25 wiz Exp $
zipint.h -- internal declarations.
Copyright (C) 1999, 2003, 2004, 2005 Dieter Baron and Thomas Klausner
@@ -46,7 +46,7 @@
#define LOCAL_MAGIC "PK\3\4"
#define EOCD_MAGIC "PK\5\6"
#define DATADES_MAGIC "PK\7\8"
-#define CDENTRYSIZE 46
+#define CDENTRYSIZE 46u
#define LENTRYSIZE 30
#define MAXCOMLEN 65536
#define EOCDLEN 22
