There is now a cononical order of metadata headers.

diff --git a/report.c b/report.c
index f1c63b846db80251fe8edec5dfc9b7011ecbf76f..482f189f0d6eaa20ad19a3aafe614748eee63599 100644 (file)
--- a/report.c
+++ b/report.c
@@ -493,10 +493,10 @@ main(int argc, char *argv[])
     report_time("Reduction done");
 
     puts("#SHIF-B 1.0");
-    puts("Merge-Program: shredcompare 1.0");
-    printf("Shred-Size: %d\n", shiflist[0].shred_size);
     printf("Hash-Method: %s\n", shiflist[0].hash_method);
+    puts("Merge-Program: shredcompare 1.0");
     printf("Normalization: %s\n", shiflist[0].normalization);
+    printf("Shred-Size: %d\n", shiflist[0].shred_size);
     puts("%%");
 
     for (; hitlist->next; hitlist = hitlist->next)

diff --git a/shredcompare.py b/shredcompare.py
index ae83973f82ed45af422b6b62d06ba00ef2c3c3e7..7bce9905d7ee8cc5ef11ce7d4db3ccb2b5a2cbd3 100755 (executable)
--- a/shredcompare.py
+++ b/shredcompare.py
@@ -241,10 +241,10 @@ if __name__ == '__main__':
     report_time("Reduction done")
     # OK, dump all matches.
     print "#SHIF-B 1.0"
-    print "Merge-Program: shredcompare.py 1.0"
     print "Hash-Method: MD5"
-    print "Shred-Size: %d" % shiflist[0].shredsize
     print "Normalization:", ",".join(shiflist[0].normalization)
+    print "Merge-Program: shredcompare.py 1.0"
+    print "Shred-Size: %d" % shiflist[0].shredsize
     print "%%"
     # FIXME: do something appropriate with comments
     for match in matches:

diff --git a/shredtree.c b/shredtree.c
index 0ff4181b39e301b2f85059c6d52ca31ce67224d0..6e3f64296e485cb1f4ffabf74d1678918ea1f249 100644 (file)
--- a/shredtree.c
+++ b/shredtree.c
@@ -230,8 +230,8 @@ main(int argc, char *argv[])
     puts("#SHIF-A 1.0");
     puts("Generator-Program: shredtree 1.0");
     puts("Hash-Method: MD5");
-    printf("Shred-Size: %d\n", shredsize);
     printf("Normalization: %s\n", rws ? "remove_whitespace" : "none");
+    printf("Shred-Size: %d\n", shredsize);
     puts("%%");
 
     /* make file list */

diff --git a/shredtree.py b/shredtree.py
index d9b9685efa102ba4cee55790390cd22438d914a4..2196c9eb0e0417c43abcc8f522fed1bc973b51aa 100755 (executable)
--- a/shredtree.py
+++ b/shredtree.py
@@ -102,12 +102,12 @@ if __name__ == '__main__':
         print "#SHIF-A 1.0"
         print "Generator-Program: shredtree.py 1.0"
         print "Hash-Method: MD5"
+        print "Normalization: %s" % ",".join(normalization);
         print "Shred-Size: %d" % shredsize
         normalization = []
         if ws: normalization.append("remove_whitespace")
         if not normalization:
             normalization.append("none")
-        print "Normalization: %s" % ",".join(normalization);
         print "%%"        
         filenames = []
         for root, dirs, files in os.walk(args[0]):