From 5e1c1b8b9926824d37cd061c08f60f84122b4393 Mon Sep 17 00:00:00 2001 From: Todd A Ouska Date: Thu, 9 Jun 2011 16:43:03 -0700 Subject: [PATCH] libz warning fixes --- configure.in | 4 ++-- src/cyassl_int.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index ec318cd53..dcefeeee5 100644 --- a/configure.in +++ b/configure.in @@ -405,7 +405,7 @@ AC_ARG_WITH(libz, CPPFLAGS="$CPPFLAGS -DHAVE_LIBZ" LIBS="$LIBS -lz" - AC_TRY_LINK([#include ], [ deflateInit(NULL, 8); ], + AC_TRY_LINK([#include ], [ deflateInit(0, 8); ], [ libz_linked=yes ], [ libz_linked=no ]) if test "x$libz_linked" == "xno" ; then @@ -419,7 +419,7 @@ AC_ARG_WITH(libz, LDFLAGS="$LDFLAGS -L$trylibzdir/lib" CPPFLAGS="$CPPFLAGS -I$trylibzdir/include" - AC_TRY_LINK([#include ], [ deflateInit(NULL, 8); ], + AC_TRY_LINK([#include ], [ deflateInit(0, 8); ], [ libz_linked=yes ], [ libz_linked=no ]) if test "x$libz_linked" == "xno" ; then diff --git a/src/cyassl_int.c b/src/cyassl_int.c index a37f85368..cc7f5662d 100644 --- a/src/cyassl_int.c +++ b/src/cyassl_int.c @@ -212,14 +212,16 @@ static INLINE void ato32(const byte* c, word32* u32) #ifdef HAVE_LIBZ /* alloc user allocs to work with zlib */ - void* myAlloc(void* opaque, unsigned int item, unsigned int size) + static void* myAlloc(void* opaque, unsigned int item, unsigned int size) { + (void)opaque; return XMALLOC(item * size, opaque, DYNAMIC_TYPE_LIBZ); } - void myFree(void* opaque, void* memory) + static void myFree(void* opaque, void* memory) { + (void)opaque; XFREE(memory, opaque, DYNAMIC_TYPE_LIBZ); }