blowfish, gdbm plugins: Export to (). Remove (runtime blowfish).

Punt import-blowfish and import-gdbm2.  Fix merged references to
GDBM2.

diff --git a/src/blowfish/blowfish.pkg b/src/blowfish/blowfish.pkg
index aad20bcdc5be2dcff9abf1ec25cf0ba2bbd47668..ec4f4abce32ace5a3546e3c7e4fffc9e929e581d 100644 (file)
--- a/src/blowfish/blowfish.pkg
+++ b/src/blowfish/blowfish.pkg
@@ -29,10 +29,7 @@ USA.
 (define-package (blowfish)
   (files "blowfish")
   (parent ())
-  ;; These are "exported" to (runtime blowfish) during load-option.
   (export ()
-         import-blowfish)
-  (export (blowfish global)
          blowfish-cbc
          blowfish-cfb64
          blowfish-ecb
@@ -42,8 +39,4 @@ USA.
          blowfish-set-key
          compute-blowfish-init-vector
          read-blowfish-file-header
-         write-blowfish-file-header))
-
-(define-package (blowfish global)
-  ;; Just to get cref to analyze whether all exports are defined.
-  )
\ No newline at end of file
+         write-blowfish-file-header))
\ No newline at end of file

diff --git a/src/blowfish/make.scm b/src/blowfish/make.scm
index 361256f13d701c9cea843e5efd8c7d3a2b91e268..effb48ee42a4494493af29a3f31cc9f4e379d32b 100644 (file)
--- a/src/blowfish/make.scm
+++ b/src/blowfish/make.scm
@@ -6,21 +6,4 @@
   (lambda ()
     (load-package-set "blowfish")))
 
-(add-subsystem-identification! "Blowfish" '(0 2 1))
-
-;; "Export" these to the (runtime blowfish) package bindings.
-(let ((runtime (->environment '(runtime blowfish)))
-      (blowfish (->environment '(blowfish))))
-  (for-each
-    (lambda (name)
-       (environment-assign! runtime name (environment-lookup blowfish name)))
-    '(blowfish-cbc
-      blowfish-cfb64
-      blowfish-ecb
-      blowfish-encrypt-port
-      blowfish-file?
-      blowfish-ofb64
-      blowfish-set-key
-      compute-blowfish-init-vector
-      read-blowfish-file-header
-      write-blowfish-file-header)))
\ No newline at end of file
+(add-subsystem-identification! "Blowfish" '(0 2 1))
\ No newline at end of file

diff --git a/src/gdbm/gdbm.pkg b/src/gdbm/gdbm.pkg
index f85606372f6a27ac12f554c54714a181ee08797d..18a20e0693e0ad745be71970ce8bd7e4c0895b7b 100644 (file)
--- a/src/gdbm/gdbm.pkg
+++ b/src/gdbm/gdbm.pkg
@@ -34,8 +34,6 @@ USA.
          cp1-ref
          ustring-cp-size
          ustring?)
-  (export ()
-         import-gdbm2)
   (export ()
          gdbm-close
          gdbm-delete

diff --git a/src/gdbm/gdbm.scm b/src/gdbm/gdbm.scm
index b337e47ff5da61f7aae8a9f09fbfd879be516e79..0e8c2f668760392230475675db1cef2920aa725b 100644 (file)
--- a/src/gdbm/gdbm.scm
+++ b/src/gdbm/gdbm.scm
@@ -24,39 +24,11 @@ USA.
 
 |#
 
-;;;; The GDBM2 option.
+;;;; The GDBM option.
 ;;; package: (gdbm)
 
 (declare (usual-integrations))
 \f
-(define (import-gdbm2)
-  (let ((target-environment (nearest-repl/environment))
-       (source-environment (->environment '(gdbm))))
-    (for-each (lambda (name)
-               (link-variables target-environment name
-                               source-environment name))
-             '(gdbm-close
-               gdbm-delete
-               gdbm-exists?
-               gdbm-fetch
-               gdbm-firstkey
-               gdbm-nextkey
-               gdbm-open
-               gdbm-reorganize
-               gdbm-setopt
-               gdbm-store
-               gdbm-sync
-               gdbm-version
-               gdbm_cachesize
-               gdbm_fast
-               ;;gdbm_fastmode obsolete
-               gdbm_insert
-               gdbm_newdb
-               gdbm_reader
-               gdbm_replace
-               gdbm_wrcreat
-               gdbm_writer))))
-
 (C-include "gdbm")
 
 (define-integrable (every-loop proc ref string start end)

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index fa7fd7ab5675524b7f2eb129850a9736f1d6dd06..c5bee3e2bf95a06c27ca82700934b2b1b5721a27 100644 (file)
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -102,22 +102,6 @@ USA.
          unsigned-integer->bit-string
          write-bits!))
 
-(define-package (runtime blowfish)
-  (files "blowfish")
-  (parent (runtime))
-  (export ()
-         blowfish-available?
-         blowfish-cbc
-         blowfish-cfb64
-         blowfish-ecb
-         blowfish-encrypt-port
-         blowfish-file?
-         blowfish-ofb64
-         blowfish-set-key
-         compute-blowfish-init-vector
-         read-blowfish-file-header
-         write-blowfish-file-header))
-
 (define-package (runtime boolean)
   (files "boole")
   (parent (runtime))