sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs: fully parenthesize MIN and MAX macros

Browse Source 
Signed-off-by: Juha Niskanen <juha.niskanen@haltian.com>
This commit is contained in:
Juha Niskanen 2020-12-08 18:29:58 +02:00 committed by Xiang Xiao
parent 33125e929c
commit cd41ed9b6d
6 changed files with 15 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/fat/fs_fat32.h
View File

@ -983,20 +983,6 @@ struct fat_dirinfo_s
struct fs_fatdir_s dir; /* Used with opendir, readdir, etc. */
};
/* Generic helper macros ****************************************************/
#ifndef MIN
# define MIN(a,b) (a < b ? a : b)
#endif
#ifndef MAX
# define MAX(a,b) (a > b ? a : b)
#endif
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Public Function Prototypes
****************************************************************************/

8
fs/fat/fs_fat32dirent.c
View File

@ -71,6 +71,14 @@
#include "inode/inode.h"
#include "fs_fat32.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
/****************************************************************************
* Private Types
****************************************************************************/

10
fs/hostfs/hostfs.h
View File

@ -52,16 +52,6 @@
* Pre-processor Definitions
****************************************************************************/
/* Quasi-standard definitions */
#ifndef MIN
# define MIN(a,b) (a < b ? a : b)
#endif
#ifndef MAX
# define MAX(a,b) (a > b ? a : b)
#endif
#define HOSTFS_MAX_PATH 256
/****************************************************************************

4
fs/nxffs/nxffs.h
View File

@ -191,11 +191,11 @@
/* Quasi-standard definitions */
#ifndef MIN
# define MIN(a,b) (a < b ? a : b)
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (a > b ? a : b)
# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
/****************************************************************************

13
fs/procfs/fs_procfsutil.c
View File

@ -51,11 +51,7 @@
****************************************************************************/
#ifndef MIN
# define MIN(a,b) ((a < b) ? a : b)
#endif
#ifndef MAX
# define MAX(a,b) ((a > b) ? a : b)
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
/****************************************************************************
@ -78,9 +74,10 @@
*
* procfs_memcpy() is a helper function. Each read() method should
* provide data in a local data buffer ('src' and 'srclen'). This
* will transfer the data to the user receive buffer ('dest' and 'destlen'),
* respecting both (1) the size of the destination buffer so that it will
* write beyond the user receiver and (1) the file position, 'offset'.
* will transfer the data to the user receive buffer ('dest' and
* 'destlen'), respecting both (1) the size of the destination buffer so
* that it will write beyond the user receiver and (1) the file position,
* 'offset'.
*
* This function will skip over data until the under of bytes specified
* by 'offset' have been skipped. Then it will transfer data from the

10
fs/smartfs/smartfs.h
View File

@ -176,16 +176,6 @@
#define SMART_MAGICSIZE 4
/* Quasi-standard definitions */
#ifndef MIN
# define MIN(a,b) (a < b ? a : b)
#endif
#ifndef MAX
# define MAX(a,b) (a > b ? a : b)
#endif
/* Underlying MTD Block driver access functions */
#define FS_BOPS(f) (f)->fs_blkdriver->u.i_bops