summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Blandy <jimb@red-bean.com>1999-09-12 03:47:39 +0000
committerJim Blandy <jimb@red-bean.com>1999-09-12 03:47:39 +0000
commit0d03da62e3d65c60fe29d645cb62200c1359c1af (patch)
tree72b6bda4614d3bbb89e4a3f2c979f34447b240b4
parent645813f5882403923698565077e31cbb9642b845 (diff)
downloadguile-0d03da62e3d65c60fe29d645cb62200c1359c1af.tar.gz
Change the name of the objects returned by OPENDIR from
"directory" to "directory stream". A predicate named "directory?" would be confusing. * filesys.c (scm_directory_stream_p): Renamed from scm_directory_p. At the Scheme level, "directory?" -> "directory-stream?". (scm_dir_print): Use the phrase "directory stream" in printed form. * filesys.h (scm_directory_stream_p): Prototype renamed accordingly.
-rw-r--r--libguile/filesys.c6
-rw-r--r--libguile/filesys.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/libguile/filesys.c b/libguile/filesys.c
index 83211dd70..2f172c4d7 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -581,9 +581,9 @@ scm_rmdir (path)
long scm_tc16_dir;
-SCM_PROC (s_directory_p, "directory?", 1, 0, 0, scm_directory_p);
+SCM_PROC (s_directory_stream_p, "directory-stream?", 1, 0, 0, scm_directory_stream_p);
SCM
-scm_directory_p (SCM obj)
+scm_directory_stream_p (SCM obj)
{
return SCM_NIMP (obj) && SCM_DIRP (obj) ? SCM_BOOL_T : SCM_BOOL_F;
}
@@ -667,7 +667,7 @@ scm_dir_print (SCM exp, SCM port, scm_print_state *pstate)
scm_puts ("#<", port);
if (SCM_CLOSEDP (exp))
scm_puts ("closed: ", port);
- scm_puts ("directory ", port);
+ scm_puts ("directory stream ", port);
scm_intprint (SCM_CDR (exp), 16, port);
scm_putc ('>', port);
return 1;
diff --git a/libguile/filesys.h b/libguile/filesys.h
index 9aa019ac1..294cc2368 100644
--- a/libguile/filesys.h
+++ b/libguile/filesys.h
@@ -2,7 +2,7 @@
#ifndef FILESYSH
#define FILESYSH
-/* Copyright (C) 1995,1997,1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1997,1998, 1999 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -66,7 +66,7 @@ extern SCM scm_rename SCM_P ((SCM oldname, SCM newname));
extern SCM scm_delete_file SCM_P ((SCM str));
extern SCM scm_mkdir SCM_P ((SCM path, SCM mode));
extern SCM scm_rmdir SCM_P ((SCM path));
-extern SCM scm_directory_p (SCM obj);
+extern SCM scm_directory_stream_p (SCM obj);
extern SCM scm_opendir SCM_P ((SCM dirname));
extern SCM scm_readdir SCM_P ((SCM port));
extern SCM scm_rewinddir SCM_P ((SCM port));