From 06421a7093d63556209648334652701cf5f78dbf Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Wed, 1 Dec 2021 16:28:45 +0100
Subject: [PATCH] MISC: Don't use reserved macro names
---
src/net/listen.c | 48 ++++++++++++++++++++++++++----------------------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/net/listen.c b/src/net/listen.c
index aa2f2da7..04c6b325 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -929,12 +929,12 @@ handle_queue_events(struct lkt_state *srv)
#define LOG_EVENT(type)
#endif
-#define __CASE(type, func) \
+#define CASE(type, func) \
case LKT_EVENT_##type: \
LOG_EVENT(type) \
func; \
break;
-#define __ATTR_IS_STATE(state, func) \
+#define ATTR_IS_STATE(state, func) \
{ \
if ((__LKT_PLAY_##state) == (size_t)evt.attr) { \
func; \
@@ -949,7 +949,7 @@ redo:
evt = lkt_queue_handle(&srv->queue);
// clang-format off
switch (evt.type) {
- __CASE(PLAY_POS, {
+ CASE(PLAY_POS, {
string = LKT_ALLOC_ARRAY(char, BUFFER_MAX);
safe_snprintf(string, BUFFER_MAX, "%ld", (size_t)evt.attr);
arguments_to_pass[0] = string;
@@ -958,40 +958,44 @@ redo:
free(string);
})
- __CASE(PLAY_NEXT, command_next(srv, 0, NULL))
- __CASE(PLAY_PREV, command_previous(srv, 0, NULL))
+ CASE(PLAY_NEXT, command_next(srv, 0, NULL))
+ CASE(PLAY_PREV, command_previous(srv, 0, NULL))
- __CASE(PLAY_TOGGLE, { __ATTR_IS_STATE(PAUSE, database_queue_set_paused(srv->db, 1))
- __ATTR_IS_STATE(PLAY, database_queue_set_paused(srv->db, 0))
- __ATTR_IS_STATE(TOGGLE, database_queue_toggle_pause(srv->db))
- __ATTR_IS_STATE(STOP, database_queue_stop(srv->db)) })
+ CASE(PLAY_TOGGLE, {
+ ATTR_IS_STATE(PAUSE, database_queue_set_paused(srv->db, 1))
+ ATTR_IS_STATE(PLAY, database_queue_set_paused(srv->db, 0))
+ ATTR_IS_STATE(TOGGLE, database_queue_toggle_pause(srv->db))
+ ATTR_IS_STATE(STOP, database_queue_stop(srv->db))
+ })
// Note: Convertion order does matter!
- __CASE(PROP_VOL, database_config_queue(srv->db, "volume", (int)(size_t)evt.attr))
- __CASE(PROP_DUR, database_config_queue(srv->db, "duration", (int)(size_t)evt.attr))
- __CASE(PROP_TIME, database_config_queue(srv->db, "elapsed", (int)(size_t)evt.attr))
+ CASE(PROP_VOL, database_config_queue(srv->db, "volume", (int)(size_t)evt.attr))
+ CASE(PROP_DUR, database_config_queue(srv->db, "duration", (int)(size_t)evt.attr))
+ CASE(PROP_TIME, database_config_queue(srv->db, "elapsed", (int)(size_t)evt.attr))
- __CASE(SKIP_CURRENT, {
+ CASE(SKIP_CURRENT, {
string = LKT_ALLOC_ARRAY(char, PATH_MAX);
database_queue_skip_current(srv->db, string);
MOD_CALL(srv->window_mod, "load", string);
free(string);
})
- __CASE(TOUCH_KARA, { database_update_touch(srv->db, (int)(size_t)evt.attr); })
- __CASE(DB_UPDATE_TOTAL, { srv->update_total += (size_t)evt.attr; })
- __CASE(DB_UPDATING, { srv->is_updating = (((uint8_t)(size_t)evt.attr) > 0); })
- __CASE(DB_UPDATE_TICK, {
+ CASE(TOUCH_KARA, { database_update_touch(srv->db, (int)(size_t)evt.attr); })
+ CASE(DB_UPDATE_TOTAL, { srv->update_total += (size_t)evt.attr; })
+ CASE(DB_UPDATING, { srv->is_updating = (((uint8_t)(size_t)evt.attr) > 0); })
+ CASE(DB_UPDATE_TICK, {
if (srv->update_current != ((size_t)-1))
srv->update_current++;
if (srv->update_current >= srv->update_total)
- (LOG_WARN("EVENT", "Force updating state because tikcs exceded the update count"), srv->is_updating = 0,
- srv->update_total = 0, srv->update_current = 0);
+ (LOG_WARN("EVENT", "Force updating state because tikcs exceded the update count"),
+ srv->is_updating = 0,
+ srv->update_total = 0,
+ srv->update_current = 0);
srv->mpd_idle_events |= MPD_IDLE_DATABASE;
})
/* The null event / ignored events, just return / continue */
- __CASE(PLAY_FILE, {})
+ CASE(PLAY_FILE, {})
case LKT_EVENT_NULL:
return;
@@ -1002,8 +1006,8 @@ redo:
// clang-format on
goto redo;
-#undef __ATTR_IS_STATE
-#undef __CASE
+#undef ATTR_IS_STATE
+#undef CASE
}
/*******************
--
GitLab