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

2 files changed, 20 insertions, 7 deletions

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
 
diff --git a/lib/system.mli b/lib/system.mli
index c9c1df08aa..2513ca19db 100644
--- a/lib/system.mli
+++ b/lib/system.mli
@@ -31,9 +31,6 @@ val find_file_in_path :
   and a suffix. The intern functions raise the exception [Bad_magic_number]
   when the check fails, with the full file name. *)
 
-val marshal_out : out_channel -> 'a -> unit
-val marshal_in : string -> in_channel -> 'a
-
 exception Bad_magic_number of string
 
 val raw_extern_intern : int ->
@@ -44,6 +41,17 @@ val extern_intern : ?warn:bool -> int ->
 
 val with_magic_number_check : ('a -> 'b) -> 'a -> 'b
 
+(** Clones of Marshal.to_channel (with flush) and
+    Marshal.from_channel (with nice error message) *)
+
+val marshal_out : out_channel -> 'a -> unit
+val marshal_in : string -> in_channel -> 'a
+
+(** Clones of Digest.output and Digest.input (with nice error message) *)
+
+val digest_out : out_channel -> Digest.t -> unit
+val digest_in : string -> in_channel -> Digest.t
+
 (** {6 Sending/receiving once with external executable } *)
 
 val connect : (out_channel -> unit) -> (in_channel -> 'a) -> string -> 'a