|
 |
5ca68d |
From 22ba14e45e84e0bd12a9ab1c9d0460b9ae27c10c Mon Sep 17 00:00:00 2001
|
|
|
5ca68d |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
5ca68d |
Date: Mon, 9 Aug 2010 12:10:40 +0400
|
|
|
5ca68d |
Subject: [PATCH 1/1] More parentheses
|
|
|
5ca68d |
|
|
|
5ca68d |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
5ca68d |
---
|
|
|
5ca68d |
lib/fuse.c | 8 +++-----
|
|
|
5ca68d |
lib/fuse_lowlevel.c | 2 +-
|
|
|
5ca68d |
2 files changed, 4 insertions(+), 6 deletions(-)
|
|
|
5ca68d |
|
|
|
5ca68d |
diff --git a/lib/fuse.c b/lib/fuse.c
|
|
|
5ca68d |
index d511964..328ebba 100644
|
|
|
5ca68d |
--- a/lib/fuse.c
|
|
|
5ca68d |
+++ b/lib/fuse.c
|
|
|
5ca68d |
@@ -991,17 +991,15 @@ static int fuse_compat_open(struct fuse_fs *fs, const char *path,
|
|
|
5ca68d |
{
|
|
|
5ca68d |
int err;
|
|
|
5ca68d |
if (!fs->compat || fs->compat >= 25)
|
|
|
5ca68d |
- err = fs->op.open(path, fi);
|
|
|
5ca68d |
+ err = (fs->op.open)(path, fi);
|
|
|
5ca68d |
else if (fs->compat == 22) {
|
|
|
5ca68d |
struct fuse_file_info_compat tmp;
|
|
|
5ca68d |
memcpy(&tmp, fi, sizeof(tmp));
|
|
|
5ca68d |
- err = ((struct fuse_operations_compat22 *) &fs->op)->open(path,
|
|
|
5ca68d |
- &tmp);
|
|
|
5ca68d |
+ err = (((struct fuse_operations_compat22 *) &fs->op)->open)(path, &tmp);
|
|
|
5ca68d |
memcpy(fi, &tmp, sizeof(tmp));
|
|
|
5ca68d |
fi->fh = tmp.fh;
|
|
|
5ca68d |
} else
|
|
|
5ca68d |
- err = ((struct fuse_operations_compat2 *) &fs->op)
|
|
|
5ca68d |
- ->open(path, fi->flags);
|
|
|
5ca68d |
+ err = (((struct fuse_operations_compat2 *) &fs->op)->open)(path, fi->flags);
|
|
|
5ca68d |
return err;
|
|
|
5ca68d |
}
|
|
|
5ca68d |
|
|
|
5ca68d |
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
|
|
|
5ca68d |
index c86a910..4f19d61 100644
|
|
|
5ca68d |
--- a/lib/fuse_lowlevel.c
|
|
|
5ca68d |
+++ b/lib/fuse_lowlevel.c
|
|
|
5ca68d |
@@ -716,7 +716,7 @@ static void do_open(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
|
|
|
5ca68d |
fi.flags = arg->flags;
|
|
|
5ca68d |
|
|
|
5ca68d |
if (req->f->op.open)
|
|
|
5ca68d |
- req->f->op.open(req, nodeid, &fi);
|
|
|
5ca68d |
+ (req->f->op.open)(req, nodeid, &fi);
|
|
|
5ca68d |
else
|
|
|
5ca68d |
fuse_reply_open(req, &fi);
|
|
|
5ca68d |
}
|
|
|
5ca68d |
--
|
|
|
5ca68d |
1.7.9.3
|
|
|
5ca68d |
|