rename MEMSTRING= -> MEMSTR=

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

9 files changed, 11 insertions, 13 deletions

diff --git a/src/connection/linux-namespace.lisp b/src/connection/linux-namespace.lisp
index d279b2d..498cad9 100644
--- a/src/connection/linux-namespace.lisp
+++ b/src/connection/linux-namespace.lisp
@@ -339,7 +339,7 @@ setgroups(2) is denied in the namespace."
                (val (subseq entry (1+ pos))))
           (unless
               (and uid
-                   (memstring= var '("HOME" "SHELL" "USER" "LOGNAME" "PATH")))
+                   (memstr= var '("HOME" "SHELL" "USER" "LOGNAME" "PATH")))
             (setf (getenv var) val))))
       (when gid
         (nix:setgid gid)
diff --git a/src/image.lisp b/src/image.lisp
index d87a80c..b57350d 100644
--- a/src/image.lisp
+++ b/src/image.lisp
@@ -447,8 +447,7 @@ Called by connection types which start up remote Lisp images."
                   :goal-operation 'asdf:monolithic-compile-bundle-op))
           (let ((name (asdf:component-name requirement)))
             ;; Handle UIOP specially because it comes with ASDF.
-            (unless
-                (memstring= (asdf:primary-system-name name) '("asdf" "uiop"))
+            (unless (memstr= (asdf:primary-system-name name) '("asdf" "uiop"))
               (pushnew requirement asdf-requirements)))))
       (nreversef asdf-requirements))
     requirements))
diff --git a/src/package.lisp b/src/package.lisp
index 0022788..d738918 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -105,7 +105,7 @@
            #:unlines
            #:words
            #:unwords
-           #:memstring=
+           #:memstr=
            #:define-simple-error
            #:plist-to-cmd-args
            #:systemd--user
diff --git a/src/property/apt.lisp b/src/property/apt.lisp
index da56fa7..755ec7f 100644
--- a/src/property/apt.lisp
+++ b/src/property/apt.lisp
@@ -241,7 +241,7 @@ only upgrade Debian stable."
                          (mapcar (lambda (m)
                                    (list* m #?"${suite}-backports" +sections+))
                                  (get-mirrors))))
-         (security-suite (if (memstring= suite '("stretch" "jessie" "buster"))
+         (security-suite (if (memstr= suite '("stretch" "jessie" "buster"))
                              #?"${suite}/updates"
                              #?"${suite}-security"))
          (security (and (or (subtypep (type-of os) 'os:debian-stable)
diff --git a/src/property/lxc.lisp b/src/property/lxc.lisp
index e914213..b32f091 100644
--- a/src/property/lxc.lisp
+++ b/src/property/lxc.lisp
@@ -321,8 +321,8 @@ implications."
 
 (defun user-container-active-p (host &optional owner)
   (and (not (service:no-services-p))
-       (memstring= (get-hostname host) (lxc-ls owner "--active"))))
+       (memstr= (get-hostname host) (lxc-ls owner "--active"))))
 
 (defun user-container-running-p (host &optional owner)
   (and (not (service:no-services-p))
-       (memstring= (get-hostname host) (lxc-ls owner "--running"))))
+       (memstr= (get-hostname host) (lxc-ls owner "--running"))))
diff --git a/src/property/systemd.lisp b/src/property/systemd.lisp
index ad23867..d805660 100644
--- a/src/property/systemd.lisp
+++ b/src/property/systemd.lisp
@@ -75,8 +75,7 @@
              (systemctl #'run user :may-fail "is-enabled" service))))
       (or (string-prefix-p "linked" status)
           (string-prefix-p "masked" status)
-          (memstring=
-           status '("static" "disabled" "generated" "transient" "indirect"))))))
+          (memstr= status '("static" "disabled" "generated" "transient" "indirect"))))))
   (:apply (systemctl #'mrun user "disable" service)))
 
 (defprop masked :posix (service &optional user)
@@ -101,7 +100,7 @@
        (multiple-value-bind (out err exit)
            (run :may-fail "loginctl" "show-user" user)
          (declare (ignore err))
-         (and (zerop exit) (memstring= "Linger=yes" (lines out))))))
+         (and (zerop exit) (memstr= "Linger=yes" (lines out))))))
   (:apply (mrun "loginctl" "enable-linger" user))
   (:unapply (if (service:no-services-p)
                 :no-change
diff --git a/src/property/user.lisp b/src/property/user.lisp
index 58ab373..f9f7f4d 100644
--- a/src/property/user.lisp
+++ b/src/property/user.lisp
@@ -80,7 +80,7 @@ the installation of other software."
            (loop for line in (lines (readfile "/etc/group"))
                  collect (car (split-string line :separator ":")))))
      (apply #'has-groups username (loop for group in *desktop-groups*
-                                        when (memstring= group existing-groups)
+                                        when (memstr= group existing-groups)
                                           collect group)))))
 
 (defprop has-login-shell :posix (username shell)
diff --git a/src/util.lisp b/src/util.lisp
index a76b6c1..83ecc63 100644
--- a/src/util.lisp
+++ b/src/util.lisp
@@ -72,7 +72,7 @@
 (defun unwords (words)
   (format nil "~{~A~^ ~}" words))
 
-(defun memstring= (string list)
+(defun memstr= (string list)
   (member string list :test #'string=))
 
 (defun assert-ordinary-ll-member (arg)
diff --git a/src/util/linux-namespace.lisp b/src/util/linux-namespace.lisp
index 9acdd0b..98b36d6 100644
--- a/src/util/linux-namespace.lisp
+++ b/src/util/linux-namespace.lisp
@@ -30,7 +30,7 @@ entry in FILE for IDENTIFIER."
                     (write-to-string (cdr (assoc :user-id info))))
           for line = (read-line file)
           for (field start count) = (split-string line :separator '(#\:))
-          when (memstring= field fields)
+          when (memstr= field fields)
             return (values (parse-integer start) (parse-integer count)))))
 
 (defun reduce-id-maps (id-maps)