diff options
author | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2000-10-25 11:01:03 +0000 |
---|---|---|
committer | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2000-10-25 11:01:03 +0000 |
commit | d1ca2c64230419163f7ad80436e83bd74fdb7b95 (patch) | |
tree | c3536f600b54e7c3db4bcc042354b4c43522f15e /libguile/filesys.c | |
parent | 31535422f5aa27febb86fbbf1030c2e2aa35e9f1 (diff) | |
download | guile-d1ca2c64230419163f7ad80436e83bd74fdb7b95.tar.gz |
* Some more work to get rid of SCM_LENGTH
* Eliminated some cell type bit fiddling
* Various minor changes
Diffstat (limited to 'libguile/filesys.c')
-rw-r--r-- | libguile/filesys.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/libguile/filesys.c b/libguile/filesys.c index 4f282d438..c7de1c615 100644 --- a/libguile/filesys.c +++ b/libguile/filesys.c @@ -547,11 +547,11 @@ SCM_DEFINE (scm_link, "link", 2, 0, 0, SCM_VALIDATE_ROSTRING (1,oldpath); if (SCM_SUBSTRP (oldpath)) oldpath = scm_makfromstr (SCM_ROCHARS (oldpath), - SCM_ROLENGTH (oldpath), 0); + SCM_STRING_LENGTH (oldpath), 0); SCM_VALIDATE_ROSTRING (2,newpath); if (SCM_SUBSTRP (newpath)) newpath = scm_makfromstr (SCM_ROCHARS (newpath), - SCM_ROLENGTH (newpath), 0); + SCM_STRING_LENGTH (newpath), 0); SCM_SYSCALL (val = link (SCM_ROCHARS (oldpath), SCM_ROCHARS (newpath))); if (val != 0) SCM_SYSERROR; @@ -1289,10 +1289,10 @@ SCM_DEFINE (scm_copy_file, "copy-file", 2, 0, 0, SCM_VALIDATE_ROSTRING (1,oldfile); if (SCM_SUBSTRP (oldfile)) - oldfile = scm_makfromstr (SCM_ROCHARS (oldfile), SCM_ROLENGTH (oldfile), 0); + oldfile = scm_makfromstr (SCM_ROCHARS (oldfile), SCM_STRING_LENGTH (oldfile), 0); SCM_VALIDATE_ROSTRING (2,newfile); if (SCM_SUBSTRP (newfile)) - newfile = scm_makfromstr (SCM_ROCHARS (newfile), SCM_ROLENGTH (newfile), 0); + newfile = scm_makfromstr (SCM_ROCHARS (newfile), SCM_STRING_LENGTH (newfile), 0); if (stat (SCM_ROCHARS (oldfile), &oldstat) == -1) SCM_SYSERROR; oldfd = open (SCM_ROCHARS (oldfile), O_RDONLY); @@ -1345,12 +1345,12 @@ SCM_DEFINE (scm_dirname, "dirname", 1, 0, 0, if (i < 0) { if (len > 0 && s[0] == '/') - return scm_make_shared_substring (filename, SCM_INUM0, SCM_MAKINUM (1)); + return scm_substring (filename, SCM_INUM0, SCM_MAKINUM (1)); else return scm_dot_string; } else - return scm_make_shared_substring (filename, SCM_INUM0, SCM_MAKINUM (i + 1)); + return scm_substring (filename, SCM_INUM0, SCM_MAKINUM (i + 1)); } #undef FUNC_NAME @@ -1384,14 +1384,12 @@ SCM_DEFINE (scm_basename, "basename", 1, 1, 0, if (i == end) { if (len > 0 && f[0] == '/') - return scm_make_shared_substring (filename, SCM_INUM0, SCM_MAKINUM (1)); + return scm_substring (filename, SCM_INUM0, SCM_MAKINUM (1)); else return scm_dot_string; } else - return scm_make_shared_substring (filename, - SCM_MAKINUM (i + 1), - SCM_MAKINUM (end + 1)); + return scm_substring (filename, SCM_MAKINUM (i + 1), SCM_MAKINUM (end + 1)); } #undef FUNC_NAME |