From d475ff0d4427fc1c3859fc5d8d0cb7cc0a32a14e Mon Sep 17 00:00:00 2001
From: letouzey
Date: Thu, 22 Aug 2013 14:29:29 +0000
Subject: Change in vo format : digest aren't Marshalled anymore

 Since digests are strings (of size 16), we just dump them
 now in vo files (cf. Digest.output) instead of using Marshal
 on them : this is cleaner and saves a few bytes.

 Increased VOMAGIC to clearly identify this change in the format.
 Please rerun ./configure after this commit.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16722 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 lib/system.ml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'lib/system.ml')

diff --git a/lib/system.ml b/lib/system.ml
index d2788de93f..37b8dee4c4 100644
--- a/lib/system.ml
+++ b/lib/system.ml
@@ -114,12 +114,17 @@ let try_remove filename =
     msg_warning
       (str"Could not remove file " ++ str filename ++ str" which is corrupted!")
 
-let marshal_out ch v = Marshal.to_channel ch v []
+let error_corrupted file = error (file ^ " is corrupted, try to rebuild it.")
+
+let marshal_out ch v = Marshal.to_channel ch v []; flush ch
 let marshal_in filename ch =
   try Marshal.from_channel ch
-  with
-    | End_of_file | Failure _ (* e.g. "truncated object" *) ->
-      error (filename ^ " is corrupted, try to rebuild it.")
+  with End_of_file | Failure _ -> error_corrupted filename
+
+let digest_out = Digest.output
+let digest_in filename ch =
+  try Digest.input ch
+  with End_of_file | Failure _ -> error_corrupted filename
 
 exception Bad_magic_number of string
 
-- 
cgit v1.2.3