From 76f91f8abb39b5add716838dace196a63ea39c70 Mon Sep 17 00:00:00 2001
From: Martin Gasbichler <gasbichl@informatik.uni-tuebingen.de>
Date: Thu, 13 Feb 2003 11:59:11 +0000
Subject: [PATCH] filename -> file-name

---
 scsh/dir-streams/dir-stream-predicates.scm | 4 ++--
 scsh/dir-streams/dir-stream.scm            | 4 ++--
 scsh/dir-streams/interfaces.scm            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scsh/dir-streams/dir-stream-predicates.scm b/scsh/dir-streams/dir-stream-predicates.scm
index 79e1bda..0b083b7 100644
--- a/scsh/dir-streams/dir-stream-predicates.scm
+++ b/scsh/dir-streams/dir-stream-predicates.scm
@@ -51,8 +51,8 @@
 (define (fs-object-name-matches? fso regexp)
   (regexp-search? regexp (fs-object-name fso)))
 
-(define (ds-object-filename-matches? fso regexp)
-  (regexp-search? regexp (fs-object-filename fso)))
+(define (ds-object-file-name-matches? fso regexp)
+  (regexp-search? regexp (fs-object-file-name fso)))
 
 ;;; test stuff
 
diff --git a/scsh/dir-streams/dir-stream.scm b/scsh/dir-streams/dir-stream.scm
index 2099e3a..b03d85b 100644
--- a/scsh/dir-streams/dir-stream.scm
+++ b/scsh/dir-streams/dir-stream.scm
@@ -42,7 +42,7 @@
 		     "/"
 		     name)))
 
-(define (fs-object-filename fs-object)
+(define (fs-object-file-name fs-object)
   (combine-path (fs-object-parent fs-object)
 		(fs-object-name fs-object)))
 
@@ -119,7 +119,7 @@
 
 ; Example:
 ; (define (disc-usage ds)
-;   (dir-stream-fold-right ds (lambda (fso sum subdirs) (list (fs-object-filename fso)
+;   (dir-stream-fold-right ds (lambda (fso sum subdirs) (list (fs-object-file-name fso)
 ; 							    (apply + sum (map cadr subdirs))
 ; 							    subdirs))
 ; 			 (lambda (fso accu)
diff --git a/scsh/dir-streams/interfaces.scm b/scsh/dir-streams/interfaces.scm
index dfe0b5d..109aa70 100644
--- a/scsh/dir-streams/interfaces.scm
+++ b/scsh/dir-streams/interfaces.scm
@@ -7,7 +7,7 @@
 	  fs-object-parent
 	  fs-object-name
 	  fs-object-info
-	  fs-object-filename))
+	  fs-object-file-name))
 
 (define-interface dir-stream-predicates-interfaces
   (export fs-object-size-less-then?
@@ -19,7 +19,7 @@
 	  fs-object-last-accessed-in?
 	  fs-object-created-in?
 	  fs-object-name-matches?
-	  ds-object-filename-matches?))
+	  ds-object-file-name-matches?))
 
 (define-interface streams-interface
   (export the-empty-stream