Messages in this thread Patch in this message |  | | From | René Scharfe <> | Subject | [PATCH] random.c MIN cleanup | Date | Sat, 27 Oct 2001 06:39:56 +0200 |
| |
Hello,
the MIN macro in random.c can be done away with. The patch below does just that.
MIN was used two times, in both cases comparing two unsigned values. The "builtin" min can be used instead.
René
--- linux-2.4.14-pre2/drivers/char/random.c Fri Oct 26 23:07:16 2001 +++ linux-2.4.14-pre2-rs/drivers/char/random.c Sat Oct 27 05:37:47 2001 @@ -406,10 +406,6 @@ * *****************************************************************/ -#ifndef MIN -#define MIN(a,b) (((a) < (b)) ? (a) : (b)) -#endif - /* * Unfortunately, while the GCC optimizer for the i386 understands how * to optimize a static rotate left of x bits, it doesn't know how to @@ -1359,7 +1355,7 @@ #endif /* Copy data to destination buffer */ - i = MIN(nbytes, HASH_BUFFER_SIZE*sizeof(__u32)/2); + i = min(nbytes, HASH_BUFFER_SIZE*sizeof(__u32)/2); if (flags & EXTRACT_ENTROPY_USER) { i -= copy_to_user(buf, (__u8 const *)tmp, i); if (!i) { @@ -1586,7 +1582,7 @@ size_t c = count; while (c > 0) { - bytes = MIN(c, sizeof(buf)); + bytes = min(c, sizeof(buf)); bytes -= copy_from_user(&buf, p, bytes); if (!bytes) { - 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/
|  |