From 89202d696685743ce6b72e667084d8a9f4b1f008 Mon Sep 17 00:00:00 2001 From: zrj Date: Sun, 13 Nov 2016 19:52:15 +0200 Subject: [PATCH] LINT64: Fix buildkernel with WANT_HAMMER2=yes. Mostly #if DEBUG paths, also use panic() in z_error() for kernel. --- sys/vfs/hammer2/zlib/hammer2_zlib_deflate.c | 2 +- sys/vfs/hammer2/zlib/hammer2_zlib_zutil.c | 4 ++++ sys/vfs/hammer2/zlib/hammer2_zlib_zutil.h | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/vfs/hammer2/zlib/hammer2_zlib_deflate.c b/sys/vfs/hammer2/zlib/hammer2_zlib_deflate.c index 4e7a71908e..0140fb5d75 100644 --- a/sys/vfs/hammer2/zlib/hammer2_zlib_deflate.c +++ b/sys/vfs/hammer2/zlib/hammer2_zlib_deflate.c @@ -767,7 +767,7 @@ longest_match(deflate_state *s, IPos cur_match) /* cur_match = current match */ */ local void -check_match(deflate_state *s, IPos start, match, int length) +check_match(deflate_state *s, IPos start, IPos match, int length) { /* check that the match is indeed a match */ if (zmemcmp(s->window + match, diff --git a/sys/vfs/hammer2/zlib/hammer2_zlib_zutil.c b/sys/vfs/hammer2/zlib/hammer2_zlib_zutil.c index e72e575950..c5dac7eaa1 100644 --- a/sys/vfs/hammer2/zlib/hammer2_zlib_zutil.c +++ b/sys/vfs/hammer2/zlib/hammer2_zlib_zutil.c @@ -127,8 +127,12 @@ int ZLIB_INTERNAL z_verbose = verbose; void ZLIB_INTERNAL z_error (char *m) { +#if defined(_KERNEL) + panic("h2 %s: %s", __func__, m); +#else fprintf(stderr, "%s\n", m); exit(1); +#endif } #endif diff --git a/sys/vfs/hammer2/zlib/hammer2_zlib_zutil.h b/sys/vfs/hammer2/zlib/hammer2_zlib_zutil.h index 98425e659d..937d456dab 100644 --- a/sys/vfs/hammer2/zlib/hammer2_zlib_zutil.h +++ b/sys/vfs/hammer2/zlib/hammer2_zlib_zutil.h @@ -19,6 +19,7 @@ # define ZLIB_INTERNAL #endif +#include /* for panic() */ #include "hammer2_zlib.h" #ifndef local @@ -125,7 +126,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #ifdef DEBUG # include extern int ZLIB_INTERNAL z_verbose; - extern void ZLIB_INTERNAL z_error((char *m)); + extern void ZLIB_INTERNAL z_error(char *m); # define Assert(cond,msg) {if(!(cond)) z_error(msg);} # define Trace(x) {if (z_verbose>=0) fprintf x ;} # define Tracev(x) {if (z_verbose>0) fprintf x ;} -- 2.11.4.GIT