aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wolfe <cwolfe@chromium.org>2012-02-07 10:42:10 -0500
committerMiklos Szeredi <mszeredi@suse.cz>2012-02-08 10:15:52 +0100
commitb0f3d73028d50d885ee30ed7b2770cee0bc69267 (patch)
tree5ba0232d575114cc5957edb129341ac81021f3ca
parent75bfa9a6c058124a650013205ef2c3e7d79aa718 (diff)
downloadsshfs-b0f3d73028d50d885ee30ed7b2770cee0bc69267.tar
sshfs-b0f3d73028d50d885ee30ed7b2770cee0bc69267.tar.gz
sshfs-b0f3d73028d50d885ee30ed7b2770cee0bc69267.tar.bz2
sshfs-b0f3d73028d50d885ee30ed7b2770cee0bc69267.zip
Remove some trailing whitespace.
Verified with `cat -vet` and `grep '\s$'`
-rw-r--r--sshfs.16
-rw-r--r--sshfs.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/sshfs.1 b/sshfs.1
index 27dd8bc..0768d59 100644
--- a/sshfs.1
+++ b/sshfs.1
@@ -173,7 +173,7 @@ allow access to root
\fB\-o\fR nonempty
allow mounts over non\-empty file/dir
.HP
-\fB\-o\fR default_permissions
+\fB\-o\fR default_permissions
enable permission checking by kernel
.TP
\fB\-o\fR fsname=NAME
@@ -248,7 +248,7 @@ perform reads asynchronously (default)
\fB\-o\fR sync_read
perform reads synchronously
.SS "Module options:"
-.TP
+.TP
[subdir]
.TP
\fB\-o\fR subdir=DIR
@@ -256,7 +256,7 @@ prepend this directory to all paths (mandatory)
.TP
\fB\-o\fR [no]rellinksa
transform absolute symlinks to relative
-.TP
+.TP
[iconv]
.TP
\fB\-o\fR from_code=CHARSET
diff --git a/sshfs.c b/sshfs.c
index ef2208d..c10b20b 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -2509,7 +2509,7 @@ static struct read_chunk *sshfs_send_read(struct sshfs_file *sf, size_t size,
buf_add_uint64(&buf, offset);
buf_add_uint32(&buf, bsize);
buf_to_iov(&buf, &iov[0]);
- err = sftp_request_send(SSH_FXP_READ, iov, 1,
+ err = sftp_request_send(SSH_FXP_READ, iov, 1,
sshfs_read_begin,
sshfs_read_end,
0, rreq, NULL);
@@ -2598,7 +2598,7 @@ static void submit_read(struct sshfs_file *sf, size_t size, off_t offset,
struct read_chunk *chunk;
chunk = sshfs_send_read(sf, size, offset);
- pthread_mutex_lock(&sshfs.lock);
+ pthread_mutex_lock(&sshfs.lock);
chunk->modifver = sshfs.modifver;
chunk_put(*chunkp);
*chunkp = chunk;
@@ -3380,7 +3380,7 @@ static void set_ssh_command(void)
replace_arg(&sshfs.ssh_args.argv[0],
sshfs.ssh_command);
} else {
- if (fuse_opt_insert_arg(&sshfs.ssh_args, i,
+ if (fuse_opt_insert_arg(&sshfs.ssh_args, i,
sshfs.ssh_command) == -1)
_exit(1);
}
@@ -3785,7 +3785,7 @@ int main(int argc, char *argv[])
int foreground;
struct stat st;
- res = fuse_parse_cmdline(&args, &mountpoint, &multithreaded,
+ res = fuse_parse_cmdline(&args, &mountpoint, &multithreaded,
&foreground);
if (res == -1)
exit(1);