1 files changed, 33 insertions, 33 deletions

diff --git a/gnu/gnunet/dht/client.scm b/gnu/gnunet/dht/client.scm
index 95aedc8..12bd9d7 100644
--- a/gnu/gnunet/dht/client.scm
+++ b/gnu/gnunet/dht/client.scm
@@ -103,11 +103,13 @@
                 slice-length slice/read-only make-slice/read-write slice-copy!
                 slice-slice verify-slice-readable)
           (gnu gnunet utils hat-let)
+          (only (gnu gnunet utils cut-syntax)
+                cut-syntax)
           (only (rnrs base)
                 and >= = quote * / + - define begin ... let*
                 quote case else values apply let cond if >
                 <= expt assert exact? integer? lambda for-each
-                not expt min max div-and-mod positive?)
+                not expt min max div-and-mod positive? define-syntax)
           (only (rnrs control)
                 unless when)
           (only (rnrs records syntactic)
@@ -399,15 +401,16 @@ slices in @var{old} do not impact the new search result."
       "Create a new @code{/:msg:dht:client:get} message for the query object
  @var{query}, with @var{unique-id} as ‘unique id’ and @var{options} as options."
       (define s (make-slice/read-write (sizeof /:msg:dht:client:get '())))
-      (set%! /:msg:dht:client:get '(header size) s (slice-length s))
-      (set%! /:msg:dht:client:get '(header type) s
-             (value->index (symbol-value message-type msg:dht:client:get)))
-      (set%! /:msg:dht:client:get '(options) s options)
-      (set%! /:msg:dht:client:get '(desired-replication-level) s
-             (query-desired-replication-level query))
-      (set%! /:msg:dht:client:get '(type) s (query-type query))
+      (define-syntax set%!/get (cut-syntax set%! /:msg:dht:client:get <> s <>))
+      (set%!/get '(header size) (slice-length s))
+      (set%!/get '(header type)
+                 (value->index (symbol-value message-type msg:dht:client:get)))
+      (set%!/get '(options) options)
+      (set%!/get '(desired-replication-level)
+                 (query-desired-replication-level query))
+      (set%!/get '(type) (query-type query))
       (slice-copy! (query-key query) (select /:msg:dht:client:get '(key) s))
-      (set%! /:msg:dht:client:get '(unique-id) s unique-id)
+      (set%!/get '(unique-id) unique-id)
       s)
 
     (define* (construct-client-put insertion #:optional (options 0))
@@ -421,17 +424,17 @@ object insertion with @var{options} as options."
          (+ size/header (slice-length (datum-value datum)))))
       (define header (slice-slice message 0 size/header))
       (define rest (slice-slice message size/header))
-      (set%! /:msg:dht:client:put '(header type) header
-             (value->index (symbol-value message-type msg:dht:client:put)))
-      (set%! /:msg:dht:client:put '(header size) header size)
-      (set%! /:msg:dht:client:put '(type) header (datum-type datum))
-      (set%! /:msg:dht:client:put '(option) header options)
-      (set%! /:msg:dht:client:put '(desired-replication-level) header
-             (insertion-desired-replication-level insertion))
-      (set%! /:msg:dht:client:put '(expiration) header (datum-expiration datum))
+      (define-syntax set%!/put (cut-syntax set%! /:msg:dht:client:put <> header <>))
+      (set%!/put '(header type)
+                 (value->index (symbol-value message-type msg:dht:client:put)))
+      (set%!/put '(header size) size)
+      (set%!/put '(type) (datum-type datum))
+      (set%!/put '(option) options)
+      (set%!/put '(desired-replication-level)
+                 (insertion-desired-replication-level insertion))
+      (set%!/put '(expiration) (datum-expiration datum))
       ;; Copy key-data pair to insert into the DHT.
-      (slice-copy! (datum-key datum)
-                   (select /:msg:dht:client:put '(key) header))
+      (slice-copy! (datum-key datum) (select /:msg:dht:client:put '(key) header))
       (slice-copy! (datum-value datum) rest)
       message)
 
@@ -459,20 +462,17 @@ result object @var{search-result}, with @var{unique-id} as ‘unique id’"
              (! message (make-slice/read-write size))
              (! header (slice-slice message 0 size/header))
              (! rest (slice-slice message size/header)))
-            (set%! /:msg:dht:client:result '(header type)
-                   header
-                   (value->index
-                    (symbol-value message-type msg:dht:client:result)))
-            (set%! /:msg:dht:client:result '(header size)
-                   header
-                   size)
-            (set%! /:msg:dht:client:result '(type) header type)
-            (set%! /:msg:dht:client:result '(get-path-length)
-                   header get-path-length)
-            (set%! /:msg:dht:client:result '(put-path-length)
-                   header put-path-length)
-            (set%! /:msg:dht:client:result '(unique-id) header unique-id)
-            (set%! /:msg:dht:client:result '(expiration) header expiration)
+            (define-syntax set%!/result
+              (cut-syntax set%! /:msg:dht:client:result <> header <>))
+            (set%!/result '(header type)
+                          (value->index
+                           (symbol-value message-type msg:dht:client:result)))
+            (set%!/result '(header size) size)
+            (set%!/result '(type) type)
+            (set%!/result '(get-path-length) get-path-length)
+            (set%!/result '(put-path-length) put-path-length)
+            (set%!/result '(unique-id) unique-id)
+            (set%!/result '(expiration) expiration)
             (slice-copy! key (select /:msg:dht:client:result '(key) header))
             ;; TODO: get-path and put path!
             (slice-copy! value rest)