From: Christos Zoulas <christos@zoulas.com>
Date: Tue, 31 Oct 2006 20:46:23 +0000 (+0000)
Subject: re-arrange so that it fits in 64 bit machines.
X-Git-Tag: FILE5_05~712
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8301f709141962a7305c42bcab022ded6e152692;p=file

re-arrange so that it fits in 64 bit machines.
bump version.
---

diff --git a/src/file.h b/src/file.h
index c35657ea..fac3e208 100644
--- a/src/file.h
+++ b/src/file.h
@@ -27,7 +27,7 @@
  */
 /*
  * file.h - definitions for file(1) program
- * @(#)$Id: file.h,v 1.78 2006/10/31 19:37:17 christos Exp $
+ * @(#)$Id: file.h,v 1.79 2006/10/31 20:46:23 christos Exp $
  */
 
 #ifndef __file_h__
@@ -74,7 +74,7 @@
 #define MAXstring 32		/* max leng of "string" types */
 
 #define MAGICNO		0xF11E041C
-#define VERSIONNO	2
+#define VERSIONNO	3
 #define FILE_MAGICSIZE	(32 * 4)
 
 #define	FILE_LOAD	0
@@ -226,9 +226,7 @@ struct magic {
 	int32_t in_offset;	/* offset from indirection */
 	/* Word 6,7 */
 	uint64_t mask;	/* mask before comparison with value */
-	/* Word 8 */
-	uint32_t dummp4;
-	/* Words 9-16 */
+	/* Words 8-15 */
 	union VALUETYPE {
 		uint8_t b;
 		uint16_t h;
@@ -243,6 +241,8 @@ struct magic {
 		uint8_t hl[4];	/* 4 bytes of a fixed-endian "long" */
 		uint8_t hq[8];	/* 8 bytes of a fixed-endian "quad" */
 	} value;		/* either number or string */
+	/* Word 16 */
+	uint32_t dummp4;
 	/* Words 17..31 */
 	char desc[MAXDESC];	/* description */
 };