From 5145dd3aa0c02c9fc496d1432fc4410674206e1d Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 20 Feb 2017 00:05:31 -0800 Subject: Import Upstream version 3a2 --- uri.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'uri.scm') diff --git a/uri.scm b/uri.scm index 6a02827..9a0db0b 100644 --- a/uri.scm +++ b/uri.scm @@ -207,10 +207,10 @@ (if idx-at (substring authority (+ 1 idx-at) (string-length authority)) authority)) - (idx-: (string-index hostport #\:)) - (host (if idx-: (substring hostport 0 idx-:) hostport)) - (port (and idx-: - (substring hostport (+ 1 idx-:) (string-length hostport))))) + (cdx (string-index hostport #\:)) + (host (if cdx (substring hostport 0 cdx) hostport)) + (port (and cdx + (substring hostport (+ 1 cdx) (string-length hostport))))) (if (or userinfo port) (list userinfo host (or (string->number port) port)) host))) @@ -269,10 +269,10 @@ uri))) (if front (let* ((len (string-length front)) - (idx-: (string-index front #\:)) - (scheme (and idx-: (substring front 0 idx-:))) - (path (if idx-: - (substring front (+ 1 idx-:) len) + (cdx (string-index front #\:)) + (scheme (and cdx (substring front 0 cdx))) + (path (if cdx + (substring front (+ 1 cdx) len) front))) (cond ((eqv? 0 (substring? "//" path)) (set! len (string-length path)) -- cgit v1.2.3