From cb2571b12cbe9bbddf5807cf43c9d15315f78cd6 Mon Sep 17 00:00:00 2001
From: Nev3r <apophycens@gmail.com>
Date: Sun, 12 Apr 2020 17:52:38 +0200
Subject: [PATCH] Rename the macros, reshape them slightly to avoid mixed
 declarations, and add a finalizer.

---
 src/taglist.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/taglist.h b/src/taglist.h
index e44696d3e..3fe24fdcb 100644
--- a/src/taglist.h
+++ b/src/taglist.h
@@ -29,23 +29,25 @@ void Taglist_AddToLines (const size_t tag, const size_t itemid);
 void Taglist_AddToMapthings (const size_t tag, const size_t itemid);
 #endif //__R_TAGLIST__
 
-#define Tag_IterateSectors(tag, sc)\
-size_t kk;\
+#define TAG_ITER_SECTORS(tag, sc)\
 if(tags_sectors[tag])\
+{	size_t kk;\
 	for(kk = 0, sc = tags_sectors[tag]->elements[0];\
 		kk < tags_sectors[tag]->count;\
 		sc = tags_sectors[tag]->elements[++kk])
 
-#define Tag_IterateLines(tag, li)\
-size_t kk;\
+#define TAG_ITER_LINES(tag, li)\
 if(tags_lines[tag])\
+{	size_t kk;\
 	for(kk = 0, li = tags_lines[tag]->elements[0];\
 		kk < tags_lines[tag]->count;\
 		li = tags_lines[tag]->elements[++kk])
 
-#define Tag_IterateMapthings(tag, mt)\
-size_t kk;\
+#define TAG_ITER_THINGS(tag, mt)\
 if(tags_mapthings[tag])\
+{	size_t kk;\
 	for(kk = 0, mt = tags_mapthings[tag]->elements[0];\
 		kk < tags_mapthings[tag]->count;\
 		mt = tags_mapthings[tag]->elements[++kk])
+
+#define TAG_ITER_END }