Change CLOSE-RESOURCE so that second argument is required rather than

optional.

diff --git a/v7/src/imail/imail-core.scm b/v7/src/imail/imail-core.scm
index e6594a672da5ea1300fd9504c26cf92f0b0df251..03d9d6b02875265c03a490fdba4df7d0202b3c32 100644 (file)
--- a/v7/src/imail/imail-core.scm
+++ b/v7/src/imail/imail-core.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-core.scm,v 1.141 2001/06/03 01:22:31 cph Exp $
+;;; $Id: imail-core.scm,v 1.142 2001/06/03 01:42:28 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2001 Massachusetts Institute of Technology
 ;;;
@@ -465,19 +465,20 @@
 
 (define (open-resource url)
   (or (get-memoized-resource url)
-      (memoize-resource (%open-resource url) close-resource)))
+      (memoize-resource (%open-resource url)
+                       (lambda (resource) (close-resource resource #t)))))
 
 (define-generic %open-resource (url))
 
 ;; -------------------------------------------------------------------
-;; Close RESOURCE, freeing up connections, memory, etc.  Subsequent use
-;; of the resource must work, but may incur a significant time or space
-;; penalty.  Optional argument NO-DEFER? means that the resource must
-;; be closed immediately, and not deferred.
+;; Close RESOURCE, freeing up connections, memory, etc.  Subsequent
+;; use of the resource must work, but may incur a significant time or
+;; space penalty.  NO-DEFER? means that the resource must be closed
+;; immediately, and not deferred.
 
-(define (close-resource resource #!optional no-defer?)
+(define (close-resource resource no-defer?)
   (save-resource resource)
-  (%close-resource resource (if (default-object? no-defer?) #f no-defer?)))
+  (%close-resource resource no-defer?))
 
 (define-generic %close-resource (resource no-defer?))
 

diff --git a/v7/src/imail/imail-file.scm b/v7/src/imail/imail-file.scm
index 025c07845d9b907ae0664063e64b495ab9bf239d..923b5e35de2fc572da27881d6af083e84b4437c1 100644 (file)
--- a/v7/src/imail/imail-file.scm
+++ b/v7/src/imail/imail-file.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-file.scm,v 1.76 2001/06/03 01:22:54 cph Exp $
+;;; $Id: imail-file.scm,v 1.77 2001/06/03 01:42:31 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2001 Massachusetts Institute of Technology
 ;;;
@@ -459,7 +459,7 @@
       (call-with-input-xstring (file-folder-xstring folder) 0 reader)))))
 \f
 (define-method discard-folder-cache ((folder <file-folder>))
-  (close-resource folder))
+  (close-resource folder #f))
 
 (define-method probe-folder ((folder <file-folder>))
   folder

diff --git a/v7/src/imail/imail-imap.scm b/v7/src/imail/imail-imap.scm
index 042df648b8a35e56a9032e4c2e0af5c475d06a32..23723eea6f5fca72f1647c5a69df7a6f3176209e 100644 (file)
--- a/v7/src/imail/imail-imap.scm
+++ b/v7/src/imail/imail-imap.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-imap.scm,v 1.177 2001/06/03 01:39:30 cph Exp $
+;;; $Id: imail-imap.scm,v 1.178 2001/06/03 01:42:40 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2001 Massachusetts Institute of Technology
 ;;;
@@ -1535,7 +1535,7 @@
   #f)
 
 (define-method discard-folder-cache ((folder <imap-folder>))
-  (close-resource folder)
+  (close-resource folder #f)
   (reset-imap-folder! folder))
 
 (define-method probe-folder ((folder <imap-folder>))
@@ -1549,7 +1549,7 @@
       'OFFLINE))
 
 (define-method disconnect-folder ((folder <imap-folder>))
-  (close-resource folder))
+  (close-resource folder #f))
 
 (define-method folder-supports-mime? ((folder <imap-folder>))
   folder