From cd41ed9b6d8b968d535ba50ed0bbacb1ab314952 Mon Sep 17 00:00:00 2001
From: Juha Niskanen <juha.niskanen@haltian.com>
Date: Tue, 8 Dec 2020 18:29:58 +0200
Subject: [PATCH] fs: fully parenthesize MIN and MAX macros

Signed-off-by: Juha Niskanen <juha.niskanen@haltian.com>
---
 fs/fat/fs_fat32.h         | 14 --------------
 fs/fat/fs_fat32dirent.c   |  8 ++++++++
 fs/hostfs/hostfs.h        | 10 ----------
 fs/nxffs/nxffs.h          |  4 ++--
 fs/procfs/fs_procfsutil.c | 13 +++++--------
 fs/smartfs/smartfs.h      | 10 ----------
 6 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/fs/fat/fs_fat32.h b/fs/fat/fs_fat32.h
index c88179dcb5..f646b1ac8f 100644
--- a/fs/fat/fs_fat32.h
+++ b/fs/fat/fs_fat32.h
@@ -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
  ****************************************************************************/
diff --git a/fs/fat/fs_fat32dirent.c b/fs/fat/fs_fat32dirent.c
index 8ba2aae21d..f8a7d582b1 100644
--- a/fs/fat/fs_fat32dirent.c
+++ b/fs/fat/fs_fat32dirent.c
@@ -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
  ****************************************************************************/
diff --git a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h
index 47053b2bc5..a796d4e89d 100644
--- a/fs/hostfs/hostfs.h
+++ b/fs/hostfs/hostfs.h
@@ -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
 
 /****************************************************************************
diff --git a/fs/nxffs/nxffs.h b/fs/nxffs/nxffs.h
index 610af72ac1..1f9866dc5f 100644
--- a/fs/nxffs/nxffs.h
+++ b/fs/nxffs/nxffs.h
@@ -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
 
 /****************************************************************************
diff --git a/fs/procfs/fs_procfsutil.c b/fs/procfs/fs_procfsutil.c
index 9dd4f53674..dbf79878f1 100644
--- a/fs/procfs/fs_procfsutil.c
+++ b/fs/procfs/fs_procfsutil.c
@@ -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
diff --git a/fs/smartfs/smartfs.h b/fs/smartfs/smartfs.h
index 3b887ff23f..f1ed3bb4f9 100644
--- a/fs/smartfs/smartfs.h
+++ b/fs/smartfs/smartfs.h
@@ -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