Skip to contentSkip to conversation

lib/zlib-deflate MIN/MAX removal

PATCH New Michael Veeck 1 participant 1 message Feb 26, 2004 Kernel janitors

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib/zlib-deflate MIN/MAX removal

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

Best Regards
Michael

lib/zlib_deflate/deftree.c +1 -5
@@ -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) {

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors