From: Hans Kristian Rosbach Date: Thu, 14 May 2015 10:04:51 +0000 (+0200) Subject: Replace NULL comparisons X-Git-Tag: 1.9.9-b1~820 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54e89ea53f8d61f10a3499acbb4629dec07690d5;p=thirdparty%2Fzlib-ng.git Replace NULL comparisons Conflicts: trees.c --- diff --git a/trees.c b/trees.c index 3504fa317..c735f008a 100644 --- a/trees.c +++ b/trees.c @@ -858,14 +858,14 @@ void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, char *buf, ulg stored_len, if (static_lenb <= opt_lenb) opt_lenb = static_lenb; } else { - Assert(buf != (char*)0, "lost buf"); + Assert(buf != NULL, "lost buf"); opt_lenb = static_lenb = stored_len + 5; /* force a stored block */ } #ifdef FORCE_STORED - if (buf != (char*)0) { /* force stored block */ + if (buf != NULL) { /* force stored block */ #else - if (stored_len+4 <= opt_lenb && buf != (char*)0) { + if (stored_len+4 <= opt_lenb && buf != NULL) { /* 4: two words for the lengths */ #endif /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.