opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed nesting when not using plugins 

The logical nesting (defined by {...}) did not match the physical nesting
(defined by #ifdef...#endif)
pull/2/head
Jean-Pierre André 2017-02-11 09:26:58 +01:00
parent 8f0fbd286d
commit c314a8115b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ntfs-3g_common.c
View File

@ -877,7 +877,8 @@ void close_reparse_plugins(ntfs_fuse_context_t *ctx)
* does not harm Windows).
*/
BOOL user_xattrs_allowed(ntfs_fuse_context_t *ctx, ntfs_inode *ni)
BOOL user_xattrs_allowed(ntfs_fuse_context_t *ctx __attribute__((unused)),
ntfs_inode *ni)
{
u32 dt_type;
BOOL res;
@ -903,10 +904,10 @@ BOOL user_xattrs_allowed(ntfs_fuse_context_t *ctx, ntfs_inode *ni)
|| S_ISDIR(stbuf.st_mode);
}
free(reparse);
}
#else /* PLUGINS_DISABLED */
res = FALSE; /* mountpoints, symlinks, ... */
#endif /* PLUGINS_DISABLED */
}
} else {
/* Metadata */
if (ni->mft_no < FILE_first_user)

2
src/ntfs-3g_common.h
View File

@ -200,6 +200,7 @@ int ntfs_parse_options(struct ntfs_options *popts, void (*usage)(void),
int ntfs_fuse_listxattr_common(ntfs_inode *ni, ntfs_attr_search_ctx *actx,
char *list, size_t size, BOOL prefixing);
BOOL user_xattrs_allowed(ntfs_fuse_context_t *ctx, ntfs_inode *ni);
#ifndef PLUGINS_DISABLED
@ -208,7 +209,6 @@ const struct plugin_operations *select_reparse_plugin(ntfs_fuse_context_t *ctx,
ntfs_inode *ni, REPARSE_POINT **reparse);
int register_reparse_plugin(ntfs_fuse_context_t *ctx, le32 tag,
const plugin_operations_t *ops, void *handle);
BOOL user_xattrs_allowed(ntfs_fuse_context_t *ctx, ntfs_inode *ni);
#endif /* PLUGINS_DISABLED */