From: Bartosz Golaszewski <bartekgola@gmail.com>
Date: Sat, 18 Jan 2014 14:25:58 +0000 (+0100)
Subject: sort.c: remove a magic number from compare_keys()
X-Git-Tag: 1_23_0~214
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1a4d9f652169afa08680d3ff2c2cf9efa2a76a1b;p=oweals%2Fbusybox.git

sort.c: remove a magic number from compare_keys()

Use bitwise OR of proper flags instead.

Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/coreutils/sort.c b/coreutils/sort.c
index a1625fc9c..0b3b650c9 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -225,7 +225,7 @@ static int compare_keys(const void *xarg, const void *yarg)
 		y = *(char **)yarg;
 #endif
 		/* Perform actual comparison */
-		switch (flags & 7) {
+		switch (flags & (FLAG_n | FLAG_M | FLAG_g)) {
 		default:
 			bb_error_msg_and_die("unknown sort type");
 			break;