r8358: rename functions

diff --git a/package.lisp b/package.lisp
index e348abd2ab1e9b58135d3f019ab85dbd6eeae1ce..bba5fb8582082fe25be7731476e08761d23c9e05 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -56,8 +56,8 @@
    #:count-string-char
    #:count-string-char-if
    #:hexchar
-   #:uriencode-string
-   #:uridecode-string
+   #:encode-uri-string
+   #:decode-uri-string
    #:non-alphanumericp
    #:random-string
    #:first-char

diff --git a/strings.lisp b/strings.lisp
index 179bdb3ccea252a7c415f58259aea1fe0bb44734..e9a73a3c9c7f1c3041680fc6cc9b5466bb08fe03 100644 (file)
--- a/strings.lisp
+++ b/strings.lisp
@@ -427,7 +427,7 @@ for characters in a string"
        (+ 10 (- code +char-code-upper-a+))
        (- code +char-code-0+))))
 
-(defun uriencode-string (query)
+(defun encode-uri-string (query)
   "Escape non-alphanumeric characters for URI fields"
   (declare (simple-string query)
           (optimize (speed 3) (safety 0) (space 0)))
@@ -450,7 +450,7 @@ for characters in a string"
            (setf (schar str dpos) (hexchar (logand c 15))))
        (setf (schar str dpos) ch)))))
 
-(defun uridecode-string (query)
+(defun decode-uri-string (query)
   "Unescape non-alphanumeric characters for URI fields"
   (declare (simple-string query)
           (optimize (speed 3) (safety 0) (space 0)))