From ddc9b922c263a8168bd4c482965c22c0ce8c54d3 Mon Sep 17 00:00:00 2001 From: Stelian Ionescu Date: Sat, 29 Dec 2007 19:01:39 +0100 Subject: [PATCH] Use IGNORE-PARSE-ERRORS where appropriate. Signed-off-by: Stelian Ionescu --- sockets/dns/nameservers.lisp | 2 +- sockets/namedb/protocols.lisp | 4 ++-- sockets/namedb/services.lisp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sockets/dns/nameservers.lisp b/sockets/dns/nameservers.lisp index 01ba26d..6266ca3 100644 --- a/sockets/dns/nameservers.lisp +++ b/sockets/dns/nameservers.lisp @@ -44,7 +44,7 @@ the latter does not contain dots.") (when (< (length tokens) 2) (error 'parse-error)) (destructuring-bind (option value &rest more-values) tokens (switch (option :test #'string-equal) - ("nameserver" (ignore-some-conditions (parse-error) + ("nameserver" (ignore-parse-errors (push (ensure-address value) nameservers))) ("domain" (setf domain value)) diff --git a/sockets/namedb/protocols.lisp b/sockets/namedb/protocols.lisp index 8cbc690..235eeec 100644 --- a/sockets/namedb/protocols.lisp +++ b/sockets/namedb/protocols.lisp @@ -59,7 +59,7 @@ (or (string= protocol name) (member protocol aliases :test #'string=)))) (iterate ((tokens (serialize-etc-file file))) - (ignore-some-conditions (parse-error) + (ignore-parse-errors (let ((proto (find-protocol-in-parsed-lines tokens #'good-proto-p))) (when proto (return-from lookup-protocol-on-disk-by-name proto))))))) @@ -68,7 +68,7 @@ (declare (ignore name aliases)) (= protocol value))) (iterate ((tokens (serialize-etc-file file))) - (ignore-some-conditions (parse-error) + (ignore-parse-errors (let ((proto (find-protocol-in-parsed-lines tokens #'good-proto-p))) (when proto (return-from lookup-protocol-on-disk-by-number proto))))))) diff --git a/sockets/namedb/services.lisp b/sockets/namedb/services.lisp index e039cf1..1297dd2 100644 --- a/sockets/namedb/services.lisp +++ b/sockets/namedb/services.lisp @@ -74,7 +74,7 @@ (and (protocol-compatible-p protocol proto) (= pnum service))))) (iterate ((tokens (serialize-etc-file file))) - (ignore-some-conditions (parse-error) + (ignore-parse-errors (let ((proto (find-service-in-parsed-lines tokens #'good-proto-p))) (when proto (return-from lookup-service-on-disk-by-number proto))))))) @@ -86,7 +86,7 @@ (or (string= service name) (member service aliases :test #'string=))))) (iterate ((tokens (serialize-etc-file file))) - (ignore-some-conditions (parse-error) + (ignore-parse-errors (let ((proto (find-service-in-parsed-lines tokens #'good-proto-p))) (when proto (return-from lookup-service-on-disk-by-name proto))))))) -- 2.11.4.GIT