Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Import zlib 1.2.8 with local change merged in.

Browse Source 
ChangeLog:

        * zlib: Update to zlib 1.2.8 with local changes merged in.
This commit is contained in:
Joel Brobecker
2015-11-25 15:09:09 -08:00
parent 74b03b9133
commit da09a43651
89 changed files with 3770 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
zlib/examples/gzlog.c
View File

@@ -1,8 +1,8 @@
/*
* gzlog.c
* Copyright (C) 2004, 2008 Mark Adler, all rights reserved
* Copyright (C) 2004, 2008, 2012 Mark Adler, all rights reserved
* For conditions of distribution and use, see copyright notice in gzlog.h
* version 2.0, 25 Apr 2008
* version 2.2, 14 Aug 2012
*/
/*
@@ -750,7 +750,8 @@ local int log_recover(struct log *log, int op)
strcpy(log->end, ".add");
if (stat(log->path, &st) == 0 && st.st_size) {
len = (size_t)(st.st_size);
if (len != st.st_size || (data = malloc(st.st_size)) == NULL) {
if ((off_t)len != st.st_size ||
(data = malloc(st.st_size)) == NULL) {
log_log(log, op, "allocation failure");
return -2;
}
@@ -758,7 +759,7 @@ local int log_recover(struct log *log, int op)
log_log(log, op, ".add file read failure");
return -1;
}
ret = read(fd, data, len) != len;
ret = (size_t)read(fd, data, len) != len;
close(fd);
if (ret) {
log_log(log, op, ".add file read failure");
@@ -913,7 +914,7 @@ int gzlog_compress(gzlog *logd)
struct log *log = logd;
/* check arguments */
if (log == NULL || strcmp(log->id, LOGID) || len < 0)
if (log == NULL || strcmp(log->id, LOGID))
return -3;
/* see if we lost the lock -- if so get it again and reload the extra
@@ -952,7 +953,7 @@ int gzlog_compress(gzlog *logd)
fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
if (fd < 0)
break;
ret = write(fd, data, len) != len;
ret = (size_t)write(fd, data, len) != len;
if (ret | close(fd))
break;
log_touch(log);
@@ -963,7 +964,7 @@ int gzlog_compress(gzlog *logd)
if (fd < 0)
break;
next = DICT > len ? len : DICT;
ret = write(fd, (char *)data + len - next, next) != next;
ret = (size_t)write(fd, (char *)data + len - next, next) != next;
if (ret | close(fd))
break;
log_touch(log);
@@ -997,9 +998,9 @@ int gzlog_write(gzlog *logd, void *data, size_t len)
struct log *log = logd;
/* check arguments */
if (log == NULL || strcmp(log->id, LOGID) || len < 0)
if (log == NULL || strcmp(log->id, LOGID))
return -3;
if (data == NULL || len == 0)
if (data == NULL || len <= 0)
return 0;
/* see if we lost the lock -- if so get it again and reload the extra
@@ -1013,7 +1014,7 @@ int gzlog_write(gzlog *logd, void *data, size_t len)
fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
if (fd < 0)
return -1;
ret = write(fd, data, len) != len;
ret = (size_t)write(fd, data, len) != len;
if (ret | close(fd))
return -1;
log_touch(log);