--- libaitsync/src/zc.c	2012/07/22 22:09:47	1.3
+++ libaitsync/src/zc.c	2012/11/13 10:34:17	1.3.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: zc.c,v 1.3 2012/07/22 22:09:47 misho Exp $
+* $Id: zc.c,v 1.3.2.2 2012/11/13 10:34:17 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -49,7 +49,8 @@ SUCH DAMAGE.
 
 
 /*
- * sync_Deflate() LibZ deflate data
+ * sync_Deflate() - LibZ deflate data
+ *
  * @inf = Input file
  * @outf = Output file
  * @level = Compress level
@@ -64,37 +65,37 @@ 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
+			/* compress and write to file */
 			z.avail_out = readed;
 			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;
@@ -102,7 +103,7 @@ 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;
@@ -110,19 +111,20 @@ 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;
 		}
 	} while (flush != Z_FINISH);
 
-	// free zlib
+	/* free zlib */
 	deflateEnd(&z);
 	return ret;
 }
 
 /*
- * sync_Inflate() LibZ inflate data
+ * sync_Inflate() - LibZ inflate data
+ *
  * @inf = Input file
  * @outf = Output file
  * return: -1 error, != -1 ok
@@ -136,21 +138,21 @@ sync_Inflate(int inf, int outf)
 
 	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 = inflateInit(&z);
 	if (ret)
 		return ret;
 
 	do {
-		// set input buffer for decompress
+		/* set input buffer for decompress */
 		ret = read(inf, ibuf, Z_CHUNK);
 		if (-1 == ret) {
-			SETERR;
+			LOGERR;
 			break;
 		}
 		if (!ret)
@@ -161,7 +163,7 @@ sync_Inflate(int inf, int outf)
 		flush = Z_NO_FLUSH;
 
 		do {
-			// decompress and write to file
+			/* decompress and write to file */
 			z.avail_out = Z_CHUNK;
 			z.next_out = obuf;
 			ret = inflate(&z, flush);
@@ -169,7 +171,7 @@ 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;
@@ -177,7 +179,7 @@ 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;
@@ -185,7 +187,7 @@ sync_Inflate(int inf, int outf)
 		} while (!z.avail_out);
 	} while (flush != Z_STREAM_END);
 
-	// free zlib
+	/* free zlib */
 	inflateEnd(&z);
 	return ret;
 }