--- libaitsync/src/zc.c 2010/03/24 16:04:49 1.1.1.1.2.1 +++ libaitsync/src/zc.c 2012/11/13 10:30:44 1.3.2.1 @@ -3,15 +3,61 @@ * by Michael Pounov * * $Author: misho $ -* $Id: zc.c,v 1.1.1.1.2.1 2010/03/24 16:04:49 misho Exp $ +* $Id: zc.c,v 1.3.2.1 2012/11/13 10:30:44 misho Exp $ * -*************************************************************************/ +************************************************************************** +The ELWIX and AITNET software is distributed under the following +terms: + +All of the documentation and software included in the ELWIX and AITNET +Releases is copyrighted by ELWIX - Sofia/Bulgaria + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + by Michael Pounov . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ #include "global.h" #include "file.h" #include "zc.h" -int sync_Deflate(int inf, int outf, int level) +/* + * sync_Deflate() - LibZ deflate data + * + * @inf = Input file + * @outf = Output file + * @level = Compress level + * return: -1 error, != -1 ok +*/ +int +sync_Deflate(int inf, int outf, int level) { z_stream z; int ret, flush, readed; @@ -19,29 +65,29 @@ int sync_Deflate(int inf, int outf, int level) lseek(outf, 0l, SEEK_SET); if (lseek(inf, 0l, SEEK_SET) == -1) { - SETERR; + LOGERR; return -1; } - // init zlib + /* init zlib */ memset(&z, 0, sizeof z); ret = deflateInit(&z, level); if (ret) return ret; do { - // set input buffer for compress + /* set input buffer for compress */ readed = read(inf, ibuf, Z_CHUNK); if (-1 == readed) { - SETERR; + LOGERR; break; } else { z.avail_in = readed; z.next_in = ibuf; } - // check flush flag - flush = syncEOF(inf) ? Z_FINISH : Z_NO_FLUSH; + /* check flush flag */ + flush = sync_EOF(inf) ? Z_FINISH : Z_NO_FLUSH; do { // compress and write to file @@ -49,7 +95,7 @@ int sync_Deflate(int inf, int outf, int level) z.next_out = obuf; ret = deflate(&z, flush); if (Z_STREAM_ERROR == ret) { - syncSetErr(ENOEXEC, "Error:: can`t deflate !!!\n"); + sync_SetErr(ENOEXEC, "Error:: can`t deflate !!!\n"); flush = Z_FINISH; ret = -1; break; @@ -57,7 +103,7 @@ int sync_Deflate(int inf, int outf, int level) ret = write(outf, obuf, readed - z.avail_out); if (-1 == ret || ret != readed - z.avail_out) { - SETERR; + LOGERR; flush = Z_FINISH; ret = -1; break; @@ -65,7 +111,7 @@ int sync_Deflate(int inf, int outf, int level) } while (!z.avail_out); if (z.avail_in) { - syncSetErr(ENOEXEC, "Error:: can`t get all input for deflate !!!\n"); + sync_SetErr(ENOEXEC, "Error:: can`t get all input for deflate !!!\n"); ret = -1; break; } @@ -76,7 +122,14 @@ int sync_Deflate(int inf, int outf, int level) return ret; } -int sync_Inflate(int inf, int outf) +/* + * sync_Inflate() LibZ inflate data + * @inf = Input file + * @outf = Output file + * return: -1 error, != -1 ok +*/ +int +sync_Inflate(int inf, int outf) { z_stream z; int ret, flush; @@ -84,7 +137,7 @@ int sync_Inflate(int inf, int outf) lseek(outf, 0l, SEEK_SET); if (lseek(inf, 0l, SEEK_SET) == -1) { - SETERR; + LOGERR; return -1; } @@ -98,7 +151,7 @@ int sync_Inflate(int inf, int outf) // set input buffer for decompress ret = read(inf, ibuf, Z_CHUNK); if (-1 == ret) { - SETERR; + LOGERR; break; } if (!ret) @@ -117,7 +170,7 @@ int sync_Inflate(int inf, int outf) case Z_NEED_DICT: case Z_DATA_ERROR: case Z_MEM_ERROR: - syncSetErr(ENOEXEC, "Error:: can`t inflate !!!\n"); + sync_SetErr(ENOEXEC, "Error:: can`t inflate !!!\n"); flush = Z_STREAM_END; ret = -1; break; @@ -125,7 +178,7 @@ int sync_Inflate(int inf, int outf) ret = write(outf, obuf, Z_CHUNK - z.avail_out); if (-1 == ret || ret != Z_CHUNK - z.avail_out) { - SETERR; + LOGERR; flush = Z_STREAM_END; ret = -1; break;