X-Git-Url: https://git.distorted.org.uk/~mdw/zone/blobdiff_plain/51a6847e534bc908f97f068c5ed82ed11c85ce15..ab87c7bf4977fe6b89e8e6d1a45c300e341d366a:/net.lisp diff --git a/net.lisp b/net.lisp index 64c796d..28f10ef 100644 --- a/net.lisp +++ b/net.lisp @@ -13,12 +13,12 @@ ;;; it under the terms of the GNU General Public License as published by ;;; the Free Software Foundation; either version 2 of the License, or ;;; (at your option) any later version. -;;; +;;; ;;; This program is distributed in the hope that it will be useful, ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;;; GNU General Public License for more details. -;;; +;;; ;;; You should have received a copy of the GNU General Public License ;;; along with this program; if not, write to the Free Software Foundation, ;;; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -34,7 +34,7 @@ #:ipnet-pretty #:ipnet-string #:ipnet-broadcast #:ipnet-hosts #:ipnet-host #:ipaddr-networkp #:ipnet-subnetp #:ipnet-changeable-bytes - #:host-find# #:host-create #:defhost #:parse-ipaddr + #:host-find #:host-create #:defhost #:parse-ipaddr #:resolve-hostname #:canonify-hostname #:net #:net-find #:net-get-as-ipnet #:net-create #:defnet #:net-next-host #:net-host)) @@ -75,8 +75,7 @@ `stringify'. The START and END arguments may be used to parse out a substring." (setf str (stringify str)) - (unless end - (setf end (length str))) + (setf-default end (length str)) (let ((addr 0) (noct 0)) (loop (let* ((pos (position #\. str :start start :end end)) @@ -151,7 +150,7 @@ (defun string-ipnet (str &key (start 0) (end nil)) "Parse an IP-network from the string STR." (setf str (stringify str)) - (unless end (setf end (length str))) + (setf-default end (length str)) (let ((sl (position #\/ str :start start :end end))) (if sl (make-ipnet (parse-ipaddr (subseq str start sl))