xfsprogs: silence unused var warnings
PATCH 1/1 xfsprogs: silence unused var warnings
This takes 2 different approaches, just following similar code that already exists. It'll probably make Coverity flag the pointless assignments, unfortunately.
---
Note, this is for the libxfs-4 branch
libxfs/libxfs_priv.h +7 -3
@@ -150,9 +150,9 @@ enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC };#define XFS_TRANS_UNRESERVE_QUOTA_NBLKS (mp,tp,ip,nblks,ninos,fl) 0#define XFS_TEST_ERROR (expr,a,b,c) ( expr )#define XFS_WANT_CORRUPTED_GOTO (mp, expr, l) \ - { if (!(expr)) { error = EFSCORRUPTED; goto l; } } + { (mp) = (mp); if (!(expr)) { error = EFSCORRUPTED; goto l; } }#define XFS_WANT_CORRUPTED_RETURN (mp, expr) \ - { if (!(expr)) { return EFSCORRUPTED; } } + { (mp) = (mp); if (!(expr)) { return EFSCORRUPTED; } }#ifdef __GNUC__#define __return_address __builtin_return_address(0)
@@ -344,7 +344,11 @@ roundup_64(__uint64_t x, __uint32_t y)/* space allocation */ #define xfs_extent_busy_reuse (mp,ag,bno,len,user) ((void) 0) -#define xfs_extent_busy_insert (tp,ag,bno,len,flags) ((void) 0) +/* avoid unused variable warning */ +#define xfs_extent_busy_insert (tp,ag,bno,len,flags)({ \ + xfs_agnumber_t __foo = ag; \ + __foo = 0; \ +})#define xfs_extent_busy_trim (args,fbno,flen,bno,len) \ do { \ *(bno) = (fbno); \
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 26 lines · Eric Sandeen
This takes 2 different approaches, just following similar code that already exists. It'll probably make Coverity flag the pointless assignments, unfortunately.
Signed-off-by Eric Sandeen <[email protected]>---
Note, this is for the libxfs-4 branch
libxfs/libxfs_priv.h +2
-2@@ -150,9 +150,9 @@ enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC };#define XFS_TRANS_UNRESERVE_QUOTA_NBLKS (mp,tp,ip,nblks,ninos,fl) 0#define XFS_TEST_ERROR (expr,a,b,c) ( expr )#define XFS_WANT_CORRUPTED_GOTO (mp, expr, l) \ - { if (!(expr)) { error = EFSCORRUPTED; goto l; } } + { (mp) = (mp); if (!(expr)) { error = EFSCORRUPTED; goto l; } }#define XFS_WANT_CORRUPTED_RETURN (mp, expr) \ - { if (!(expr)) { return EFSCORRUPTED; } } + { (mp) = (mp); if (!(expr)) { return EFSCORRUPTED; } }#ifdef __GNUC__#define __return_address __builtin_return_address(0)
libxfs/libxfs_priv.h roundup_64(__uint64_t x, __uint32_t y) · line 351
Quoted 9 lines
libxfs/libxfs_priv.h +5
-1@@ -344,7 +344,11 @@ roundup_64(__uint64_t x, __uint32_t y)/* space allocation */ #define xfs_extent_busy_reuse (mp,ag,bno,len,user) ((void) 0) -#define xfs_extent_busy_insert (tp,ag,bno,len,flags) ((void) 0) +/* avoid unused variable warning */ +#define xfs_extent_busy_insert (tp,ag,bno,len,flags)({ \ + xfs_agnumber_t __foo = ag; \ + __foo = 0; \ +})
libxfs_priv.h:349:17: warning: variable '__foo' set but not used [-Wunused-but-set-variable]
xfs_agnumber_t __foo = ag; \
so I changed the second line to __foo = __foo; to get rid of this warning, as several of the other macros in that file do.
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs