From f8bcf03d4f98467e30b112664e9bfe7e42f40d6d Mon Sep 17 00:00:00 2001 From: Omar Polo Date: Mon, 15 Nov 2021 18:00:58 +0000 Subject: [PATCH 3/3] ; Simplify rcirc authentication querying functions --- lisp/net/rcirc.el | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 6030db9dae..b69b7ca4cc 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -654,30 +654,18 @@ See `rcirc-connect' for more details on these variables.") (defun rcirc-get-server-method (server) "Return authentication method for SERVER." - (catch 'method - (dolist (i rcirc-authinfo) - (let ((server-i (car i)) - (method (cadr i))) - (when (string-match server-i server) - (throw 'method method)))))) + (cadr (assoc server rcirc-authinfo (lambda (s server) + (string-match server s))))) (defun rcirc-get-server-password (server) "Return password for SERVER." - (catch 'pass - (dolist (i rcirc-authinfo) - (let ((server-i (car i)) - (args (cdddr i))) - (when (string-match server-i server) - (throw 'pass (car args))))))) + (cadddr (assoc server rcirc-authinfo (lambda (s server) + (string-match server s))))) (defun rcirc-get-server-cert (server) "Return a list of key and certificate for SERVER." - (catch 'cert - (dolist (i rcirc-authinfo) - (let ((server-i (car i)) - (args (cddr i))) - (when (string-match server-i server) - (throw 'cert args)))))) + (cddr (assoc server rcirc-authinfo (lambda (s server) + (string-match server s))))) ;;;###autoload (defun rcirc-connect (server &optional port nick user-name -- 2.33.1