[Kernel-janitors] [PATCH] lib/zlib-deflate MIN/MAX removal

[Kernel-janitors] [PATCH] lib/zlib-deflate MIN/MAX removal

[Michael Veeck]

[-- Attachment #1: Type: text/plain, Size: 131 bytes --]

Patch (against 2.6.3) removes unnecessary min/max macros and changes
calls to use kernel.h macros instead.

Best Regards
Michael



[-- Attachment #2: minmax_lib_zlib.patch --]
[-- Type: text/plain, Size: 908 bytes --]

--- linux-2.6.3.org/lib/zlib_deflate/deftree.c	2004-02-18 04:57:20.000000000 +0100
+++ linux-2.6.3.test/lib/zlib_deflate/deftree.c	2004-02-26 21:18:08.675049760 +0100
@@ -217,10 +217,6 @@
 }
 #endif /* DEBUG_ZLIB */
 
-
-#define MAX(a,b) (a >= b ? a : b)
-/* the arguments must not have side effects */
-
 /* ===========================================================================
  * Initialize the various 'constant' tables. In a multi-threaded environment,
  * this function may be called by two threads concurrently, but this is
@@ -598,7 +594,7 @@
 
         /* Create a new node father of n and m */
         tree[node].Freq = tree[n].Freq + tree[m].Freq;
-        s->depth[node] = (uch) (MAX(s->depth[n], s->depth[m]) + 1);
+        s->depth[node] = (uch) (max(s->depth[n], s->depth[m]) + 1);
         tree[n].Dad = tree[m].Dad = (ush)node;
 #ifdef DUMP_BL_TREE
         if (tree == s->bl_tree) {

[-- Attachment #3: Type: text/plain, Size: 163 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors