svn commit: trunk/busybox/miscutils

[vda at busybox.net]

Author: vda
Date: 2008-11-23 06:58:14 -0800 (Sun, 23 Nov 2008)
New Revision: 24130

Log:
strings: code shrink -22 bytes by Tito



Modified:
   trunk/busybox/miscutils/strings.c


Changeset:
Modified: trunk/busybox/miscutils/strings.c
===================================================================
--- trunk/busybox/miscutils/strings.c	2008-11-23 14:40:00 UTC (rev 24129)
+++ trunk/busybox/miscutils/strings.c	2008-11-23 14:58:14 UTC (rev 24130)
@@ -2,7 +2,7 @@
 /*
  * strings implementation for busybox
  *
- * Copyright Tito Ragusa <farmatito at tiscali.it>
+ * Copyright 2003 Tito Ragusa <farmatito at tiscali.it>
  *
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
@@ -18,7 +18,6 @@
 int strings_main(int argc UNUSED_PARAM, char **argv)
 {
 	int n, c, status = EXIT_SUCCESS;
-	unsigned opt;
 	unsigned count;
 	off_t offset;
 	FILE *file;
@@ -26,7 +25,7 @@
 	const char *fmt = "%s: ";
 	const char *n_arg = "4";
 
-	opt = getopt32(argv, "afon:", &n_arg);
+	getopt32(argv, "afon:", &n_arg);
 	/* -a is our default behaviour */
 	/*argc -= optind;*/
 	argv += optind;
@@ -56,10 +55,10 @@
 				} else {
 					string[count] = c;
 					if (count == n) {
-						if (opt & PRINT_NAME) {
+						if (option_mask32 & PRINT_NAME) {
 							printf(fmt, *argv);
 						}
-						if (opt & PRINT_OFFSET) {
+						if (option_mask32 & PRINT_OFFSET) {
 							printf("%7"OFF_FMT"o ", offset - n);
 						}
 						fputs(string, stdout);