new upstream release (3.3.0); modify package compatibility for Stretch

[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
old mode 100755 (executable)
new mode 100644 (file)
index 18829ac..5caf680
--- a/src/os_zlib/os_zlib.c
+++ b/src/os_zlib/os_zlib.c
@@ -9,37 +9,40 @@
 
 #include "os_zlib.h"
 
-unsigned long int os_zlib_compress(const char *src, char *dst, unsigned long int src_size,
-               unsigned long int dst_size)
+#ifdef ZLIB_SYSTEM
+#include <zlib.h>
+#else
+#include "../external/zlib-1.2.11/zlib.h"
+#endif
+
+unsigned long int os_zlib_compress(const char *src, char *dst,
+                                   unsigned long int src_size,
+                                   unsigned long int dst_size)
 {
-    if(compress2((Bytef *)dst,
-                 &dst_size,
-                 (const Bytef *)src,
-                 src_size,
-                 Z_BEST_COMPRESSION) == Z_OK)
-    {
+    if (compress2((Bytef *)dst,
+                  &dst_size,
+                  (const Bytef *)src,
+                  src_size,
+                  Z_BEST_COMPRESSION) == Z_OK) {
         dst[dst_size] = '\0';
-        return(dst_size);
+        return (dst_size);
     }
 
-    return(0);
+    return (0);
 }
 
-
-unsigned long int os_zlib_uncompress(const char *src, char *dst, unsigned long int src_size,
-               unsigned long int dst_size)
+unsigned long int os_zlib_uncompress(const char *src, char *dst,
+                                     unsigned long int src_size,
+                                     unsigned long int dst_size)
 {
-    if(uncompress((Bytef *)dst,
-                  &dst_size,
-                  (const Bytef *)src,
-                  src_size) == Z_OK)
-    {
+    if (uncompress((Bytef *)dst,
+                   &dst_size,
+                   (const Bytef *)src,
+                   src_size) == Z_OK) {
         dst[dst_size] = '\0';
-        return(dst_size);
+        return (dst_size);
     }
 
-    return(0);
+    return (0);
 }
 
-
-/* EOF */