Move all library initializers into their respective packages

Author: AeroNotix

dns.i

@@ -1,10 +1,7 @@
 %feature("intern_function", "swig-lispify");
 %feature("export");
 %typemap(cin) u_short ":unsigned-short";
-
 %insert("lisphead") %{
-    (defpackage :dns
-     (:use :cl :cffi))
 (in-package :dns)
 %}
 

src/dns/dns.asd

@@ -4,5 +4,6 @@
   :licence "WTFPL"
   :serial t
   :description "Helpful DNS functions where Lisp doesn't efficiently do the right things"
-  :components ((:file "ffi"))
+  :components ((:file "package")
+               (:file "ffi"))
   :depends-on (:cffi))

src/dns/ffi.lisp

@@ -4,8 +4,6 @@
 ;;; Do not make changes to this file unless you know what you are doing--modify
 ;;; the SWIG interface file instead.
 
-    (defpackage :dns
-     (:use :cl :cffi))
 (in-package :dns)
 
 

src/dns/package.lisp

@@ -0,0 +1,11 @@
+(defpackage :dns
+  (:use :cl :cffi)
+  (:export
+   #:initialize-library))
+(in-package :dns)
+
+(cffi:define-foreign-library dns
+  (:unix (:or "c-src/libdns.so")))
+
+(defun initialize-library ()
+  (cffi:use-foreign-library dns))

src/http3/package.lisp

@@ -7,15 +7,3 @@
 
 (in-package :http3)
 
-(cffi:define-foreign-library lsquic
-  (:unix (:or "lsquic/src/liblsquic/liblsquic.so")))
-
-(cffi:define-foreign-library dns
-  (:unix (:or "c-src/libdns.so")))
-
-(cffi:define-foreign-library udp
-  (:unix (:or "c-src/libudp.so")))
-
-(cffi:use-foreign-library lsquic)
-(cffi:use-foreign-library dns)
-(cffi:use-foreign-library udp)

src/lsquic/package.lisp

@@ -37,3 +37,10 @@
                      (subseq name (length s))
                      name)))
            prefixes-to-remove))) flag package))))
+
+(cffi:define-foreign-library lsquic
+    (:unix (:or "lsquic/src/liblsquic/liblsquic.so")))
+(cffi:use-foreign-library lsquic)
+
+(dns:initialize-library)
+(udp:initialize-library)

src/udp/ffi.lisp

@@ -4,8 +4,6 @@
 ;;; Do not make changes to this file unless you know what you are doing--modify
 ;;; the SWIG interface file instead.
 
-    (defpackage :udp
-     (:use :cl :cffi))
 (in-package :udp)
 
 

src/udp/package.lisp

@@ -0,0 +1,11 @@
+(defpackage :udp
+  (:use :cl :cffi)
+  (:export
+   #:initialize-library))
+(in-package :udp)
+
+(cffi:define-foreign-library udp
+  (:unix (:or "c-src/libudp.so")))
+
+(defun initialize-library ()
+  (cffi:use-foreign-library udp))

src/udp/udp.asd

@@ -4,5 +4,6 @@
   :licence "WTFPL"
   :serial t
   :description "Helpful UDP functions where Lisp doesn't efficiently do the right things"
-  :components ((:file "ffi"))
+  :components ((:file "package")
+               (:file "ffi"))
   :depends-on (:cffi))

udp.i

@@ -1,8 +1,6 @@
 %feature("intern_function", "swig-lispify");
 %feature("export");
 %insert("lisphead") %{
-    (defpackage :udp
-     (:use :cl :cffi))
 (in-package :udp)
 %}