From: Colin Clark <colin.clark@cclark.uk>
Date: Fri, 2 Feb 2024 15:28:33 +0000 (+0000)
Subject: clang-tidy: bugprone-macro-parentheses
X-Git-Tag: v2.3~59
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=b24a54a697ccaf87675f70a24f29938e39fe9775

clang-tidy: bugprone-macro-parentheses

- Fix warnings identified by this flag
- Remove the exclude from .clang-tidy file
---

diff --git a/.clang-tidy b/.clang-tidy
index 17b7897d..717b72be 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -32,7 +32,6 @@ Checks: >
   -bugprone-implicit-widening-of-multiplication-result,
   -bugprone-incorrect-roundings,
   -bugprone-integer-division,
-  -bugprone-macro-parentheses,
   -bugprone-narrowing-conversions,
   -bugprone-reserved-identifier,
   -bugprone-sizeof-expression,
diff --git a/src/collect-table.cc b/src/collect-table.cc
index c2f4c268..61944d6d 100644
--- a/src/collect-table.cc
+++ b/src/collect-table.cc
@@ -59,7 +59,7 @@ enum {
 	CTABLE_COLUMN_COUNT
 };
 
-#define INFO_SELECTED(x) (x->flag_mask & SELECTION_SELECTED)
+#define INFO_SELECTED(x) ((x)->flag_mask & SELECTION_SELECTED)
 
 
 static void collection_table_populate_at_new_size(CollectTable *ct, gint w, gint h, gboolean force);
diff --git a/src/pixbuf-renderer.cc b/src/pixbuf-renderer.cc
index 89bccd9f..ab0372bb 100644
--- a/src/pixbuf-renderer.cc
+++ b/src/pixbuf-renderer.cc
@@ -54,7 +54,7 @@ enum ExifOrientationType {
 
 
 /* default min and max zoom */
-#define PR_ZOOM_MIN -32.0
+#define PR_ZOOM_MIN (-32.0)
 #define PR_ZOOM_MAX 32.0
 
 /* distance to drag mouse to disable image flip */
diff --git a/src/renderer-tiles.cc b/src/renderer-tiles.cc
index dfe4b7f6..40d8dc0f 100644
--- a/src/renderer-tiles.cc
+++ b/src/renderer-tiles.cc
@@ -153,14 +153,14 @@ static void rt_hierarchy_changed_cb(GtkWidget *widget, GtkWidget *previous_tople
 static gint rt_queue_draw_idle_cb(gpointer data);
 
 #define GET_RIGHT_PIXBUF_OFFSET(rt) \
-        (( (rt->stereo_mode & PR_STEREO_RIGHT) && !(rt->stereo_mode & PR_STEREO_SWAP)) || \
-         (!(rt->stereo_mode & PR_STEREO_RIGHT) &&  (rt->stereo_mode & PR_STEREO_SWAP)) ?  \
-          rt->pr->stereo_pixbuf_offset_right : rt->pr->stereo_pixbuf_offset_left )
+        (( ((rt)->stereo_mode & PR_STEREO_RIGHT) && !((rt)->stereo_mode & PR_STEREO_SWAP)) || \
+         (!((rt)->stereo_mode & PR_STEREO_RIGHT) &&  ((rt)->stereo_mode & PR_STEREO_SWAP)) ?  \
+          (rt)->pr->stereo_pixbuf_offset_right : (rt)->pr->stereo_pixbuf_offset_left )
 
 #define GET_LEFT_PIXBUF_OFFSET(rt) \
-        ((!(rt->stereo_mode & PR_STEREO_RIGHT) && !(rt->stereo_mode & PR_STEREO_SWAP)) || \
-         ( (rt->stereo_mode & PR_STEREO_RIGHT) &&  (rt->stereo_mode & PR_STEREO_SWAP)) ?  \
-          rt->pr->stereo_pixbuf_offset_right : rt->pr->stereo_pixbuf_offset_left )
+        ((!((rt)->stereo_mode & PR_STEREO_RIGHT) && !((rt)->stereo_mode & PR_STEREO_SWAP)) || \
+         ( ((rt)->stereo_mode & PR_STEREO_RIGHT) &&  ((rt)->stereo_mode & PR_STEREO_SWAP)) ?  \
+          (rt)->pr->stereo_pixbuf_offset_right : (rt)->pr->stereo_pixbuf_offset_left )
 
 
 static void rt_sync_scroll(RendererTiles *rt)
diff --git a/src/search.cc b/src/search.cc
index 2dde8a31..4947948b 100644
--- a/src/search.cc
+++ b/src/search.cc
@@ -1678,7 +1678,7 @@ static void search_dnd_init(SearchData *sd)
  *-------------------------------------------------------------------
  */
 
-#define MATCH_IS_BETWEEN(val, a, b)  (b > a ? (val >= a && val <= b) : (val >= b && val <= a))
+#define MATCH_IS_BETWEEN(val, a, b)  ((b) > (a) ? ((val) >= (a) && (val) <= (b)) : ((val) >= (b) && (val) <= (a)))
 
 static gboolean search_step_cb(gpointer data);
 
diff --git a/src/view-dir-list.cc b/src/view-dir-list.cc
index 1cb86d67..0f70a336 100644
--- a/src/view-dir-list.cc
+++ b/src/view-dir-list.cc
@@ -33,7 +33,7 @@ struct ViewDirInfoList
 	GList *list;
 };
 
-#define VDLIST(_vd_) ((ViewDirInfoList *)(_vd_->info))
+#define VDLIST(_vd_) ((ViewDirInfoList *)((_vd_)->info))
 
 
 /*
diff --git a/src/view-dir-tree.cc b/src/view-dir-tree.cc
index 8cbd73ff..662c420b 100644
--- a/src/view-dir-tree.cc
+++ b/src/view-dir-tree.cc
@@ -34,7 +34,7 @@ struct ViewDirInfoTree
 	gint busy_ref;
 };
 
-#define VDTREE(_vd_) ((ViewDirInfoTree *)(_vd_->info))
+#define VDTREE(_vd_) ((ViewDirInfoTree *)((_vd_)->info))
 
 
 struct PathData