diff options
Diffstat (limited to 'module')
-rw-r--r-- | module/hnh/util.scm | 9 | ||||
-rw-r--r-- | module/sxml/transformations.scm | 2 | ||||
-rw-r--r-- | module/web/uri-query.scm | 3 |
3 files changed, 4 insertions, 10 deletions
diff --git a/module/hnh/util.scm b/module/hnh/util.scm index b0e6b81a..46557e38 100644 --- a/module/hnh/util.scm +++ b/module/hnh/util.scm @@ -58,7 +58,7 @@ vector-last - ->str ->string ->quoted-string + ->string catch* ) @@ -530,14 +530,9 @@ (define (vector-last v) (vector-ref v (1- (vector-length v)))) -(define (->str any) +(define (->string any) (with-output-to-string (lambda () (display any)))) -(define ->string ->str) - -(define (->quoted-string any) - (with-output-to-string (lambda () (write any)))) - (define-syntax catch* diff --git a/module/sxml/transformations.scm b/module/sxml/transformations.scm index 61de42aa..09b26ad4 100644 --- a/module/sxml/transformations.scm +++ b/module/sxml/transformations.scm @@ -31,7 +31,7 @@ (attribute-transformer tree `((href . ,(lambda (_ . content) - `(href ,@(transformer (string-concatenate (map ->str content)))) + `(href ,@(transformer (string-concatenate (map ->string content)))) ))))) (define (href-prefixer tree prefix) diff --git a/module/web/uri-query.scm b/module/web/uri-query.scm index adf99803..e7cc627c 100644 --- a/module/web/uri-query.scm +++ b/module/web/uri-query.scm @@ -1,5 +1,4 @@ (define-module (web uri-query) - :use-module ((hnh util) :select (->quoted-string)) :use-module ((web uri) :select (uri-encode)) :export (encode-query-parameters) ) @@ -14,7 +13,7 @@ (map (lambda (p) (format #f "~a=~a" (car p) - (uri-encode (->quoted-string (cdr p))))) + (uri-encode (with-output-to-string (lambda () (write (cdr p))))))) parameters) "&")) |