From: Christos Zoulas <christos@zoulas.com>
Date: Tue, 8 May 2007 14:44:18 +0000 (+0000)
Subject: back out timing patch
X-Git-Tag: FILE4_21~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa48f314fedc81b7a399bc063a88527e23cdf9a6;p=file

back out timing patch
---

diff --git a/src/file.c b/src/file.c
index 961ad1b1..df1d9cb5 100644
--- a/src/file.c
+++ b/src/file.c
@@ -128,7 +128,7 @@ main(int argc, char *argv[])
 	char *home, *usermagic;
 	struct stat sb;
 	static const char hmagic[] = "/.magic";
-#define OPTSTRING	"bcCde:f:F:hikLm:nNprstvz0"
+#define OPTSTRING	"bcCde:f:F:hikLm:nNprsvz0"
 #ifdef HAVE_GETOPT_LONG
 	int longindex;
 	static const struct option long_options[] =
@@ -158,7 +158,6 @@ main(int argc, char *argv[])
 		{"special-files", 0, 0, 's'},
 		{"compile", 0, 0, 'C'},
 		{"print0", 0, 0, '0'},
-		{"timing", 0, 0, 't'},
 		{0, 0, 0, 0},
 	};
 #endif
@@ -287,9 +286,6 @@ main(int argc, char *argv[])
 		case 's':
 			flags |= MAGIC_DEVICES;
 			break;
-		case 't':
-			flags |= MAGIC_TIMING;
-			break;
 		case 'v':
 			(void)fprintf(stdout, "%s-%d.%.2d\n", progname,
 				       FILE_VERSION_MAJOR, patchlevel);
@@ -580,8 +576,9 @@ help(void)
 "  -r, --raw                  don't translate unprintable chars to \\ooo\n"
 "  -s, --special-files        treat special (block/char devices) files as\n"
 "                             ordinary ones\n"
-"  -t, --timing		      print debug timing info\n"
+"or\n"
 "      --help                 display this help and exit\n"
+"or\n"
 "      --version              output version information and exit\n"
 "or\n"
 "  -C, --compile              compile file specified by -m\n"
diff --git a/src/magic.h b/src/magic.h
index 42028601..39fa2e11 100644
--- a/src/magic.h
+++ b/src/magic.h
@@ -40,7 +40,6 @@
 #define	MAGIC_PRESERVE_ATIME	0x000080 /* Restore access time on exit */
 #define	MAGIC_RAW		0x000100 /* Don't translate unprintable chars */
 #define	MAGIC_ERROR		0x000200 /* Handle ENOENT etc as real errors */
-#define MAGIC_TIMING		0x000400 /* Print timing info for each entry */
 #define MAGIC_NO_CHECK_COMPRESS	0x001000 /* Don't check for compressed files */
 #define MAGIC_NO_CHECK_TAR	0x002000 /* Don't check for tar files */
 #define MAGIC_NO_CHECK_SOFT	0x004000 /* Don't check magic entries */
diff --git a/src/softmagic.c b/src/softmagic.c
index 584a17ed..6cc0c7dc 100644
--- a/src/softmagic.c
+++ b/src/softmagic.c
@@ -111,27 +111,13 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
 	int returnval = 0; /* if a match is found it is set to 1*/
 	int firstline = 1; /* a flag to print X\n  X\n- X */
 	int printed_something = 0;
-	struct timeval starttv, curtv;
 
 	if (file_check_mem(ms, cont_level) == -1)
 		return -1;
 
-	starttv.tv_sec = 0;
 	for (magindex = 0; magindex < nmagic; magindex++) {
 		int flush;
 
-		if (ms->flags & MAGIC_TIMING) {
-			(void)gettimeofday(&curtv, NULL);
-			if (starttv.tv_sec == 0)
-				starttv = curtv;
-			else {
-				struct timeval diff;
-				timersub(&curtv, &starttv, &diff);
-				starttv = curtv;
-				(void)fprintf(stderr, "Took %ld.%ld\n",
-				    (long)diff.tv_sec, (long)diff.tv_usec);
-			}
-		}
 		ms->offset = magic[magindex].offset;
 		ms->line = magic[magindex].lineno;
 
@@ -1511,7 +1497,6 @@ magiccheck(struct magic_set *ms, struct magic *m)
 		}
 		else {
 			regmatch_t pmatch[1];
-#undef REG_STARTEND
 #ifndef REG_STARTEND
 #define	REG_STARTEND	0
 			size_t l = ms->search.s_len - 1;