all: Gather module imports.

* src/mcron/base.scm: Gather module imports.
* src/mcron/redirect.scm: Likewise.
* src/mcron/vixie-specification.scm: Likewise.
* src/mcron/vixie-time.scm: Likewise.

4 files changed, 26 insertions, 37 deletions

diff --git a/src/mcron/base.scm b/src/mcron/base.scm
index b607c05..a133f66 100644
--- a/src/mcron/base.scm
+++ b/src/mcron/base.scm
@@ -21,23 +21,19 @@
 (define-module (mcron base)
   #:use-module (ice-9 match)
   #:use-module (mcron environment)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-2)
   #:use-module (srfi srfi-9)
-  #:export     (add-job
-                remove-user-jobs
-                get-schedule
-                run-job-loop
-                   ;; These three are deprecated and not documented.
-                use-system-job-list
-                use-user-job-list
-                clear-system-jobs)
-  #:re-export  (clear-environment-mods
-                append-environment-mods))
-
-
-(use-modules (srfi srfi-1)    ;; For remove.
-             (srfi srfi-2))   ;; For and-let*.
-
-
+  #:export (add-job
+            remove-user-jobs
+            get-schedule
+            run-job-loop
+            ;; Deprecated and undocumented procedures.
+            use-system-job-list
+            use-user-job-list
+            clear-system-jobs)
+  #:re-export (clear-environment-mods
+               append-environment-mods))
 
 ;; The list of all jobs known to the system. Each element of the list is
 ;;
diff --git a/src/mcron/redirect.scm b/src/mcron/redirect.scm
index 7474c4a..6711407 100644
--- a/src/mcron/redirect.scm
+++ b/src/mcron/redirect.scm
@@ -33,12 +33,11 @@
 ;;;; Code:
 
 (define-module (mcron redirect)
-  #:export (with-mail-out)
+  #:use-module (ice-9 popen)
   #:use-module (ice-9 regex)
-  #:use-module ((mcron config) :select (config-sendmail))
-  #:use-module (mcron vixie-time))
-
-
+  #:use-module (mcron config)
+  #:use-module (mcron vixie-time)
+  #:export (with-mail-out))
 
 ;; An action string consists of a sequence of characters forming a command
 ;; executable by the shell, possibly followed by an non-escaped percentage
@@ -63,8 +62,6 @@
 ;; the string, and output (including the error output) being sent to a pipe
 ;; opened on a mail transport.
 
-(use-modules (ice-9 popen))
-
 (define (with-mail-out action . user)
 
   ;; Determine the name of the user who is to recieve the mail, looking for a
diff --git a/src/mcron/vixie-specification.scm b/src/mcron/vixie-specification.scm
index 4356db7..e040fe0 100644
--- a/src/mcron/vixie-specification.scm
+++ b/src/mcron/vixie-specification.scm
@@ -27,22 +27,20 @@
 ;;;; Code:
 
 (define-module (mcron vixie-specification)
+  #:use-module (ice-9 regex)
+  #:use-module (ice-9 rdelim)
+  #:use-module (mcron base)
+  #:use-module (mcron config)
+  #:use-module (mcron job-specifier)
+  #:use-module (mcron redirect)
+  #:use-module (mcron vixie-time)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-2)
   #:export (parse-user-vixie-line
             parse-system-vixie-line
             read-vixie-port
             read-vixie-file
-            check-system-crontab)
-  #:use-module ((mcron config) :select (config-socket-file))
-  #:use-module (mcron base)
-  #:use-module (mcron job-specifier)
-  #:use-module (mcron redirect)
-  #:use-module (mcron vixie-time))
-
-
-(use-modules (ice-9 regex) (ice-9 rdelim)
-             (srfi srfi-1) (srfi srfi-2) (srfi srfi-13) (srfi srfi-14))
-
-
+            check-system-crontab))
 
 ;; A line in a Vixie-style crontab file which gives a command specification
 ;; carries two pieces of information: a time specification consisting of five
diff --git a/src/mcron/vixie-time.scm b/src/mcron/vixie-time.scm
index f734600..c4d6bd9 100644
--- a/src/mcron/vixie-time.scm
+++ b/src/mcron/vixie-time.scm
@@ -20,8 +20,6 @@
   #:use-module (ice-9 regex)
   #:use-module (mcron job-specifier)
   #:use-module (srfi srfi-1)
-  #:use-module (srfi srfi-13)
-  #:use-module (srfi srfi-14)
   #:export (parse-vixie-time))
 
 ;; In Vixie-style time specifications three-letter symbols are allowed to stand