From 8745c33afbb7b103e9aa27adbd55884e6bbd4b51 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 31 Dec 2010 12:44:11 -0500 Subject: rename string->uri and uri->string. * module/web/uri.scm (string->uri, uri->string): Rename from parse-uri and unparse-uri. * test-suite/tests/web-uri.test: * module/web/http.scm: All callers changed. --- module/web/http.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/web/http.scm') diff --git a/module/web/http.scm b/module/web/http.scm index f2f086632..7bad3af86 100644 --- a/module/web/http.scm +++ b/module/web/http.scm @@ -628,7 +628,7 @@ ordered alist." (display (date->string date "~a, ~d ~b ~Y ~H:~M:~S GMT") port)) (define (write-uri uri port) - (display (unparse-uri uri) port)) + (display (uri->string uri) port)) (define (parse-entity-tag val) (if (string-prefix? "W/" val) @@ -751,7 +751,7 @@ not have to have a scheme or host name. The result is a URI object." #:query (and q (substring str (1+ q) (or f end))) #:fragment (and f (substring str (1+ f) end))))) (else - (or (parse-uri (substring str start end)) + (or (string->uri (substring str start end)) (bad-request "Invalid URI: ~a" (substring str start end)))))) (define (read-request-line port) @@ -890,7 +890,7 @@ phrase\"." ((_ sym name) (declare-header sym name - (lambda (str) (or (parse-uri str) (bad-header-component 'uri str))) + (lambda (str) (or (string->uri str) (bad-header-component 'uri str))) uri? write-uri)))) -- cgit v1.2.3