X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fos_zlib%2Fzlib-test.c;h=8a132d6192e5c99b76ff9bc7f2a72bbf7c1ee9ea;hb=HEAD;hp=587d56b41cddbd4e9006bc43ca30d37d856bd190;hpb=301048b51990573e58a30dc4a5bb4ec285cad554;p=ossec-hids.git

diff --git a/src/os_zlib/zlib-test.c b/src/os_zlib/zlib-test.c
old mode 100755
new mode 100644
index 587d56b..8a132d6
--- a/src/os_zlib/zlib-test.c
+++ b/src/os_zlib/zlib-test.c
@@ -1,5 +1,3 @@
-/* @(#) $Id$ */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All rights reserved.
  *
@@ -9,61 +7,56 @@
  * Foundation
  */
 
- 
-#include "shared.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
 #include "os_zlib.h"
 
 #ifndef ARGV0
-  #define ARGV0   "zlib-test"
+#define ARGV0   "zlib-test"
 #endif
 
+
 /* Zlib test */
 int main(int argc, char **argv)
 {
-    int ret, srcsize, dstsize = 2010; 
+    unsigned long int ret, srcsize, dstsize = 2010;
     char dst[2048];
     char dst2[2048];
 
     memset(dst, 0, 2048);
     memset(dst2, 0, 2048);
 
-    if(argc < 2)
-    {
+    if (argc < 2) {
         printf("%s: string\n", argv[0]);
         exit(1);
     }
-    
+
     srcsize = strlen(argv[1]);
-    if(srcsize > 2000)
-    {
+    if (srcsize > 2000) {
         printf("%s: string too large\n", argv[0]);
         exit(1);
 
     }
-    
-    if((ret = os_compress(argv[1], dst, srcsize, dstsize)))
-    {
-        printf("Compressed, from %d->%d\n",srcsize, ret);
-    }
-    else
-    {
+
+    if ((ret = os_zlib_compress(argv[1], dst, srcsize, dstsize))) {
+        printf("Compressed, from %lu->%lu\n", srcsize, ret);
+    } else {
         printf("FAILED compressing.\n");
         exit(1);
     }
 
-    /* Setting new srcsize for decompression */
+    /* Set new srcsize for decompression */
     srcsize = ret;
-    
-    if((ret = os_uncompress(dst, dst2, srcsize, dstsize)))
-    {
-        printf("Uncompressed ok. String: '%s', size %d->%d\n", 
-                                        dst2, srcsize, ret); 
-    }
-    else
-    {
+
+    if ((ret = os_zlib_uncompress(dst, dst2, srcsize, dstsize))) {
+        printf("Uncompressed ok. String: '%s', size %lu->%lu\n",
+               dst2, srcsize, ret);
+    } else {
         printf("FAILED uncompressing.\n");
         exit(1);
     }
 
-    return(0);
+    return (0);
 }