[gnunet-scheme] 18/324: Fix variable references

[gnunet]

This is an automated email from the git hooks/post-receive script.

maxime-devos pushed a commit to branch master
in repository gnunet-scheme.

commit 073d0b1a14f2a5bb45892144740121b9be70f9ed
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Mon Nov 9 14:39:35 2020 +0100

    Fix variable references
---
 gnu/gnunet/metadata.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/gnunet/metadata.scm b/gnu/gnunet/metadata.scm
index d8504d3..c7e8f22 100644
--- a/gnu/gnunet/metadata.scm
+++ b/gnu/gnunet/metadata.scm
@@ -71,7 +71,7 @@
     (opaque #t)
     (sealed #t))
 
-  (define (meta-data-item-size item)
+  (define (meta-item-data-size item)
     "How large is the @lisp{meta-item-data} of the <meta-item>
 @var{item}? Expressed in bytes."
     (bytevector-length (%meta-item-data item)))
@@ -170,8 +170,8 @@ meta data) name of extracting plugin
     (assert (bytevector? data))
     ;; Figure out where to insert or set the meta data.
     ;; TODO: binary search instead of linear search
-    (let ((items (meta-data-items data))
-         (items-length (vector-length items)))
+    (let* ((items (meta-data-items data))
+          (items-length (vector-length items)))
       (let loop ((i 0))
        (cond ((or (>= i items-length)
                   (< (meta-item-data-size (vector-ref items i))))
@@ -191,17 +191,17 @@ meta data) name of extracting plugin
                                  data))
               ;; If format and mime-type aren't changed,
               ;; just keep the old structure (freshness is not required).
-              (let* ((item (vector-ref items i))
-                     (new-mime-type (or (meta-item-mime-type item)
+              (let* ((old-item (vector-ref items i))
+                     (new-mime-type (or (meta-item-mime-type old-item)
                                         data-mime-type))
-                     (old-format (meta-item-format item))
+                     (old-format (meta-item-format old-item))
                      (new-format
                       (if (and (equal? old-format METAFORMAT_C_STRING)
                                (equal? format METAFORMAT_UTF8))
                           METAFORMAT_UTF8
                           old-format))
                      (new-item (%make-meta-item new-mime-type
-                                                (meta-item-data item)
+                                                (%meta-item-data old-item)
                                                 meta-item-data
                                                 meta-item-format)))
                 (if (equal? old-item new-item)
@@ -363,7 +363,7 @@ TODO: perhaps a variant raising conditions may be more 
informative."
                                 cdata-bv
                                 (+ mdata-offset
                                    left
-                                   plugin-data-length
+                                   plugin-name-length
                                    -1)))))
                 #f)
              ;; FIXME plen or entry-data-length
@@ -404,7 +404,7 @@ TODO: perhaps a variant raising conditions may be more 
informative."
                  format
                  mime-type-string
                  (bv-slice cdata-bv meta-data-offset
-                           entry-data-size))))
+                           entry-data-length))))
             (loop-metadata (+ i 1)
                            new-md
                            left))))))

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.