|
 |
25247e |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
25247e |
Date: Mon, 9 Aug 2010 12:10:40 +0400
|
|
|
25247e |
Subject: [PATCH] More parentheses
|
|
|
25247e |
|
|
|
25247e |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
25247e |
|
|
|
25247e |
diff --git a/lib/fuse.c b/lib/fuse.c
|
|
|
25247e |
index d1d873a..ca1709c 100644
|
|
|
25247e |
--- a/lib/fuse.c
|
|
|
25247e |
+++ b/lib/fuse.c
|
|
|
25247e |
@@ -1529,17 +1529,15 @@ static int fuse_compat_open(struct fuse_fs *fs, const char *path,
|
|
|
25247e |
{
|
|
|
25247e |
int err;
|
|
|
25247e |
if (!fs->compat || fs->compat >= 25)
|
|
|
25247e |
- err = fs->op.open(path, fi);
|
|
|
25247e |
+ err = (fs->op.open)(path, fi);
|
|
|
25247e |
else if (fs->compat == 22) {
|
|
|
25247e |
struct fuse_file_info_compat tmp;
|
|
|
25247e |
memcpy(&tmp, fi, sizeof(tmp));
|
|
|
25247e |
- err = ((struct fuse_operations_compat22 *) &fs->op)->open(path,
|
|
|
25247e |
- &tmp);
|
|
|
25247e |
+ err = (((struct fuse_operations_compat22 *) &fs->op)->open)(path, &tmp);
|
|
|
25247e |
memcpy(fi, &tmp, sizeof(tmp));
|
|
|
25247e |
fi->fh = tmp.fh;
|
|
|
25247e |
} else
|
|
|
25247e |
- err = ((struct fuse_operations_compat2 *) &fs->op)
|
|
|
25247e |
- ->open(path, fi->flags);
|
|
|
25247e |
+ err = (((struct fuse_operations_compat2 *) &fs->op)->open)(path, fi->flags);
|
|
|
25247e |
return err;
|
|
|
25247e |
}
|
|
|
25247e |
|
|
|
25247e |
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
|
|
|
25247e |
index ff03c63..255f733 100644
|
|
|
25247e |
--- a/lib/fuse_lowlevel.c
|
|
|
25247e |
+++ b/lib/fuse_lowlevel.c
|
|
|
25247e |
@@ -1211,7 +1211,7 @@ static void do_open(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
|
|
|
25247e |
fi.flags = arg->flags;
|
|
|
25247e |
|
|
|
25247e |
if (req->f->op.open)
|
|
|
25247e |
- req->f->op.open(req, nodeid, &fi);
|
|
|
25247e |
+ (req->f->op.open)(req, nodeid, &fi);
|
|
|
25247e |
else
|
|
|
25247e |
fuse_reply_open(req, &fi);
|
|
|
25247e |
}
|