remove some uses of old accessors

The newer ones are harder to use incorrectly,
and perform some validation.

1 files changed, 17 insertions, 4 deletions

diff --git a/gnu/gnunet/metadata/struct.scm b/gnu/gnunet/metadata/struct.scm
index 7d8c420..1b54c6a 100644
--- a/gnu/gnunet/metadata/struct.scm
+++ b/gnu/gnunet/metadata/struct.scm
@@ -31,7 +31,8 @@
           MetaType MetaFormat)
   (import (only (gnu gnunet utils netstruct)
                 structure/packed u32/big
-                sizeof wrap-reader-setter)
+                sizeof wrap-reader-setter
+                offset)
           (only (gnu extractor metaformats)
                 integer->meta-format meta-format->integer)
           (only (gnu extractor metatypes)
@@ -47,11 +48,14 @@
      ;; Version is 1 for a NULL pointer
      ;; Version 2 is for 0.9.x (and possibly higher)
      ;; Other version numbers are not yet defined.
-     (version u32/big)
+     ("version" u32/big)
      ;; How many MD entries are there?
-     (entries u32/big)
+     ("entries" u32/big)
      ;; Number of bytes of meta data
-     (size    u32/big)))
+     ("size"    u32/big)))
+  ;; This is followed by 'entries' values of type 'struct MetaDataEntry'
+  ;; and then by 'entry' plugin names, mime-types and data blocks
+  ;; as specified in those meta data entries.
 
   (assert (= (sizeof MetaDataHeader ()) 12))
 
@@ -60,6 +64,15 @@
   (define-syntax MetaFormat
     (wrap-reader-setter u32/big integer->meta-format meta-format->integer))
 
+  (assert (= (sizeof MetaType ()) 4))
+  (assert (= (sizeof MetaFormat ()) 4))
+  ;; catch some old issues
+  (assert (= (offset MetaType ()) 0))
+  (assert (= (offset MetaFormat ()) 0))
+  (assert (= (offset MetaDataHeader ("version")) 0))
+  (assert (= (offset MetaDataHeader ("entries")) 4))
+  (assert (= (offset MetaDataHeader ("size")) 8))
+
   (define-syntax MetaDataEntry
     (structure/packed
      ;; Meta data type