svn commit: trunk/busybox/util-linux

aldot at busybox.net aldot at busybox.net
Mon May 19 10:28:33 UTC 2008


Author: aldot
Date: 2008-05-19 03:28:32 -0700 (Mon, 19 May 2008)
New Revision: 22010

Log:
- improve readability


Modified:
   trunk/busybox/util-linux/dmesg.c


Changeset:
Modified: trunk/busybox/util-linux/dmesg.c
===================================================================
--- trunk/busybox/util-linux/dmesg.c	2008-05-19 09:48:17 UTC (rev 22009)
+++ trunk/busybox/util-linux/dmesg.c	2008-05-19 10:28:32 UTC (rev 22010)
@@ -6,7 +6,7 @@
  * Copyright 2006 Rob Landley <rob at landley.net>
  * Copyright 2006 Bernhard Fischer <rep.nop at aon.at>
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <sys/klog.h>
@@ -18,17 +18,22 @@
 	int len;
 	char *buf;
 	char *size, *level;
-	int flags = getopt32(argv, "cs:n:", &size, &level);
+	unsigned flags = getopt32(argv, "cs:n:", &size, &level);
+	enum {
+		OPT_c = 1<<0,
+		OPT_s = 1<<1,
+		OPT_n = 1<<2
+	};
 
-	if (flags & 4) {
+	if (flags & OPT_n) {
 		if (klogctl(8, NULL, xatoul_range(level, 0, 10)))
 			bb_perror_msg_and_die("klogctl");
 		return EXIT_SUCCESS;
 	}
 
-	len = (flags & 2) ? xatoul_range(size, 2, INT_MAX) : 16384;
+	len = (flags & OPT_s) ? xatoul_range(size, 2, INT_MAX) : 16384;
 	buf = xmalloc(len);
-	len = klogctl(3 + (flags & 1), buf, len);
+	len = klogctl(3 + (flags & OPT_c), buf, len);
 	if (len < 0)
 		bb_perror_msg_and_die("klogctl");
 	if (len == 0)




More information about the busybox-cvs mailing list