Re: Linux 2.4.30-rc2

[Willy Tarreau <willy@w.ods.org>]

Marcelo,

here's a patch from Dave Jones, which is already in 2.6 and which I've
used in my local tree for 6 months now. It removes a useless NULL check
in zlib_inflateInit2_(), since 'z' is already dereferenced one line
before the test. Can in go in 2.4.30 please ?

Thanks,
Willy

--- ./lib/zlib_inflate/inflate.c.orig	Tue Jan  7 15:50:49 2003
+++ ./lib/zlib_inflate/inflate.c	Sat Sep 18 17:30:59 2004
@@ -50,8 +50,6 @@
       return Z_VERSION_ERROR;
 
   /* initialize state */
-  if (z == Z_NULL)
-    return Z_STREAM_ERROR;
   z->msg = Z_NULL;
   z->state = &WS(z)->internal_state;
   z->state->blocks = Z_NULL;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/