projects
/
ossec-hids.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
novi upstream verzije 2.8.3
[ossec-hids.git]
/
src
/
os_zlib
/
zlib-test.c
diff --git
a/src/os_zlib/zlib-test.c
b/src/os_zlib/zlib-test.c
index
587d56b
..
8602c46
100755
(executable)
--- 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.
*
/* Copyright (C) 2009 Trend Micro Inc.
* All rights reserved.
*
@@
-9,9
+7,10
@@
* Foundation
*/
* Foundation
*/
-
-#include "shared.h"
#include "os_zlib.h"
#include "os_zlib.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
#ifndef ARGV0
#define ARGV0 "zlib-test"
#ifndef ARGV0
#define ARGV0 "zlib-test"
@@
-20,7
+19,7
@@
/* Zlib test */
int main(int argc, char **argv)
{
/* 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];
char dst[2048];
char dst2[2048];
@@
-32,7
+31,7
@@
int main(int argc, char **argv)
printf("%s: string\n", argv[0]);
exit(1);
}
printf("%s: string\n", argv[0]);
exit(1);
}
-
+
srcsize = strlen(argv[1]);
if(srcsize > 2000)
{
srcsize = strlen(argv[1]);
if(srcsize > 2000)
{
@@
-40,10
+39,10
@@
int main(int argc, char **argv)
exit(1);
}
exit(1);
}
-
- if((ret = os_compress(argv[1], dst, srcsize, dstsize)))
+
+ if((ret = os_zlib_compress(argv[1], dst, srcsize, dstsize)))
{
{
- printf("Compressed, from %d->%d\n",srcsize, ret);
+ printf("Compressed, from %lu->%lu\n",srcsize, ret);
}
else
{
}
else
{
@@
-53,11
+52,11
@@
int main(int argc, char **argv)
/* Setting new srcsize for decompression */
srcsize = ret;
/* Setting new srcsize for decompression */
srcsize = ret;
-
- if((ret = os_uncompress(dst, dst2, srcsize, dstsize)))
+
+ if((ret = os_zlib_uncompress(dst, dst2, srcsize, dstsize)))
{
{
- printf("Uncompressed ok. String: '%s', size %d->%d\n",
- dst2, srcsize, ret);
+ printf("Uncompressed ok. String: '%s', size %lu->%lu\n",
+ dst2, srcsize, ret);
}
else
{
}
else
{