diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /ftpfs/dir.c | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'ftpfs/dir.c')
| -rw-r--r-- | ftpfs/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ftpfs/dir.c b/ftpfs/dir.c index fb35a451..8ef719d8 100644 --- a/ftpfs/dir.c +++ b/ftpfs/dir.c @@ -485,7 +485,7 @@ ftpfs_refresh_node (struct node *node) } else if (*(entry->name)) { - /* The root node is treated seperately below. */ + /* The root node is treated separately below. */ struct ftp_conn *conn; err = ftpfs_get_ftp_conn (dir->fs, &conn); @@ -775,7 +775,7 @@ ftpfs_dir_lookup (struct ftpfs_dir *dir, const char *name, } /* Lookup the null name in DIR, and return a node for it in NODE. Unlike - ftpfs_dir_lookup, this won't attempt to validate the existance of the + ftpfs_dir_lookup, this won't attempt to validate the existence of the entry (to avoid opening a new connection if possible) -- that will happen the first time the entry is refreshed. Also unlink ftpfs_dir_lookup, this function doesn't expect DIR to be locked, and won't return *NODE locked. |