(read-passwd): Use clear-string instead of fillarray.

diff --git a/lisp/subr.el b/lisp/subr.el
index 67b9360f077bb94728e2e75350f93cbe2582b644..78d3a755f143a10d623ab5cd3e5479abbc7b00c4 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1180,10 +1180,10 @@ Optional DEFAULT is a default password to use instead of empty input."
                (second (read-passwd "Confirm password: " nil default)))
            (if (equal first second)
                (progn
-                 (and (arrayp second) (fillarray second ?\0))
+                 (and (arrayp second) (clear-string second))
                  (setq success first))
-             (and (arrayp first) (fillarray first ?\0))
-             (and (arrayp second) (fillarray second ?\0))
+             (and (arrayp first) (clear-string first))
+             (and (arrayp second) (clear-string second))
              (message "Password not repeated accurately; please start over")
              (sit-for 1))))
        success)
@@ -1199,18 +1199,18 @@ Optional DEFAULT is a default password to use instead of empty input."
        (clear-this-command-keys)
        (if (= c ?\C-u)
            (progn
-             (and (arrayp pass) (fillarray pass ?\0))
+             (and (arrayp pass) (clear-string pass))
              (setq pass ""))
          (if (and (/= c ?\b) (/= c ?\177))
              (let* ((new-char (char-to-string c))
                     (new-pass (concat pass new-char)))
-               (and (arrayp pass) (fillarray pass ?\0))
-               (fillarray new-char ?\0)
+               (and (arrayp pass) (clear-string pass))
+               (clear-string new-char)
                (setq c ?\0)
                (setq pass new-pass))
            (if (> (length pass) 0)
                (let ((new-pass (substring pass 0 -1)))
-                 (and (arrayp pass) (fillarray pass ?\0))
+                 (and (arrayp pass) (clear-string pass))
                  (setq pass new-pass))))))
       (message nil)
       (or pass default ""))))