novi upstream verzije 2.8.3

[ossec-hids.git] / src / os_zlib / os_zlib.c

diff --git a/src/os_zlib/os_zlib.c b/src/os_zlib/os_zlib.c
index 9ad9516..18829ac 100755 (executable)
--- a/src/os_zlib/os_zlib.c
+++ b/src/os_zlib/os_zlib.c
@@ -1,49 +1,43 @@
-/* @(#) $Id: os_zlib.c,v 1.7 2009/06/24 18:53:06 dcid Exp $ */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All rights reserved.
  *
  * This program is a free software; you can redistribute it
  * and/or modify it under the terms of the GNU General Public
- * License (version 3) as published by the FSF - Free Software
+ * License (version 2) as published by the FSF - Free Software
  * Foundation
  */
-       
-#include "shared.h"
+
 #include "os_zlib.h"
 
-/* os_compress: Compress a string with zlib. */
-int os_compress(char *src, char *dst, int src_size, int dst_size)
+unsigned long int os_zlib_compress(const char *src, char *dst, unsigned long int src_size,
+               unsigned long int dst_size)
 {
-    unsigned long int zl_dst = dst_size;
-    
-    /* We make sure to do not allow long sizes */
-    if(compress2((unsigned char *)dst, 
-                 &zl_dst, 
-                 (unsigned char *)src,
-                 (unsigned long int)src_size, 9) == Z_OK)
+    if(compress2((Bytef *)dst,
+                 &dst_size,
+                 (const Bytef *)src,
+                 src_size,
+                 Z_BEST_COMPRESSION) == Z_OK)
     {
-        dst[zl_dst] = '\0';
-        return(zl_dst);
+        dst[dst_size] = '\0';
+        return(dst_size);
     }
 
     return(0);
 }
 
 
-/* os_uncompress: Uncompress a string with zlib. */
-int os_uncompress(char *src, char *dst, int src_size, int dst_size)
+unsigned long int os_zlib_uncompress(const char *src, char *dst, unsigned long int src_size,
+               unsigned long int dst_size)
 {
-    unsigned long int zl_dst = dst_size;
-    
-    if(uncompress((unsigned char *)dst, 
-                  &zl_dst,
-                  (unsigned char *)src, 
-                  (unsigned long int)src_size) == Z_OK)
+    if(uncompress((Bytef *)dst,
+                  &dst_size,
+                  (const Bytef *)src,
+                  src_size) == Z_OK)
     {
-        dst[zl_dst] = '\0';
-        return(zl_dst);
+        dst[dst_size] = '\0';
+        return(dst_size);
     }
+
     return(0);
 }