From a1ee413fc55c7ee626dcee0ea2d8309b05b6026c Mon Sep 17 00:00:00 2001 From: Stelian Ionescu Date: Mon, 12 Nov 2007 10:33:55 +0100 Subject: [PATCH] Moved around some function definitions to avoid compile warnings Signed-off-by: Stelian Ionescu --- sockets/namedb/protocols.lisp | 20 ++++++++++---------- sockets/namedb/services.lisp | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/sockets/namedb/protocols.lisp b/sockets/namedb/protocols.lisp index 1b979e1..7668b5e 100644 --- a/sockets/namedb/protocols.lisp +++ b/sockets/namedb/protocols.lisp @@ -101,6 +101,16 @@ #'(lambda (p) (gethash p *protocols-cache-by-number*)) #'lookup-protocol-on-disk-by-number)) +(defun purge-protocols-cache (&optional file) + (declare (ignore file)) + (map 'nil #'clrhash (list *protocols-cache-by-name* + *protocols-cache-by-number*))) + +(defvar *protocols-monitor* + (make-instance 'file-monitor + :file *protocols-file* + :update-fn 'purge-protocols-cache)) + (defun lookup-protocol (protocol) "Lookup a protocol by name or number. Signals an UNKNOWN-PROTOCOL error if no protocol is found." @@ -113,13 +123,3 @@ UNKNOWN-PROTOCOL error if no protocol is found." (unsigned-byte (lookup-protocol-by-number protocol)) (string (lookup-protocol-by-name protocol))))) (or proto (error 'unknown-protocol :name protocol)))) - -(defun purge-protocols-cache (&optional file) - (declare (ignore file)) - (map 'nil #'clrhash (list *protocols-cache-by-name* - *protocols-cache-by-number*))) - -(defvar *protocols-monitor* - (make-instance 'file-monitor - :file *protocols-file* - :update-fn 'purge-protocols-cache)) diff --git a/sockets/namedb/services.lisp b/sockets/namedb/services.lisp index 211fca9..f46230a 100644 --- a/sockets/namedb/services.lisp +++ b/sockets/namedb/services.lisp @@ -144,6 +144,18 @@ #'find-service-number-in-cache #'lookup-service-on-disk-by-number)) +(defun purge-services-cache (&optional file) + (declare (ignore file)) + (map 'nil #'clrhash (list *tcp-services-cache-by-name* + *tcp-services-cache-by-number* + *udp-services-cache-by-name* + *udp-services-cache-by-number*))) + +(defvar *services-monitor* + (make-instance 'file-monitor + :file *services-file* + :update-fn 'purge-services-cache)) + (defun lookup-service (service &optional (protocol :tcp)) "Lookup a service by port or name. PROTOCOL should be one of :TCP, :UDP or :ANY." @@ -157,15 +169,3 @@ of :TCP, :UDP or :ANY." (unsigned-byte (lookup-service-by-number service protocol)) (string (lookup-service-by-name service protocol))))) (or serv (error 'unknown-service :name service)))) - -(defun purge-services-cache (&optional file) - (declare (ignore file)) - (map 'nil #'clrhash (list *tcp-services-cache-by-name* - *tcp-services-cache-by-number* - *udp-services-cache-by-name* - *udp-services-cache-by-number*))) - -(defvar *services-monitor* - (make-instance 'file-monitor - :file *services-file* - :update-fn 'purge-services-cache)) -- 2.11.4.GIT