From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Tue, 22 Jul 2008 10:10:13 +0000 (-0000)
Subject: cal: remove lone static data variable. -4 bytes. coreutils
X-Git-Tag: android-x86-2.2~1288
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a5254032f57627fa3b9b9acebc6bdd0a6e02955f;p=android-x86%2Fexternal-busybox.git

cal: remove lone static data variable. -4 bytes. coreutils
 is down to four applets with nonzero data+bss.
---

diff --git a/coreutils/cal.c b/coreutils/cal.c
index 8a93057b0..9b597772e 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -40,7 +40,8 @@ static const unsigned char sep1752[] ALIGN1 = {
 	24,	25,	26,	27,	28,	29,	30
 };
 
-static unsigned julian;
+/* Set to 0 or 1 in main */
+#define julian ((unsigned)option_mask32)
 
 /* leap year -- account for Gregorian reformation in 1752 */
 static int leap_year(unsigned yr)
@@ -87,7 +88,8 @@ int cal_main(int argc, char **argv)
 	char buf[40];
 
 	flags = getopt32(argv, "jy");
-	julian = flags & 1;
+	/* This sets julian = flags & 1: */
+	option_mask32 &= 1;
 	month = 0;
 	argv += optind;
 	argc -= optind;
@@ -100,7 +102,7 @@ int cal_main(int argc, char **argv)
 		time(&now);
 		local_time = localtime(&now);
 		year = local_time->tm_year + 1900;
-		if (!(flags & 2)) {
+		if (!(flags & 2)) { /* no -y */
 			month = local_time->tm_mon + 1;
 		}
 	} else {