mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-22 06:59:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some badly-behaved macros

Browse source 
Some macros evaluated their arguments more than once when it was not
needed, or were missing parentheses.
This commit is contained in:
Demi Marie Obenour 2022-09-01 17:02:44 -04:00
parent bb4f274ae0
commit 671a7102ff
46 changed files with 162 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spa/include/spa/support/log-impl.h
View file

@ -121,7 +121,7 @@ struct { \
#define SPA_LOG_IMPL_INIT(name) \
{ { { SPA_TYPE_INTERFACE_Log, SPA_VERSION_LOG, \
SPA_CALLBACKS_INIT(&name.methods, &name) }, \
SPA_CALLBACKS_INIT(&(name).methods, &(name)) }, \
SPA_LOG_LEVEL_INFO, }, \
{ SPA_VERSION_LOG_METHODS, \
spa_log_impl_log, \

14
spa/include/spa/support/log.h
View file

@ -212,7 +212,7 @@ struct spa_log_methods {
#define SPA_LOG_TOPIC(v, t) \
(struct spa_log_topic){ .version = v, .topic = (t)}
(struct spa_log_topic){ .version = (v), .topic = (t)}
#define spa_log_topic_init(l, topic) \
do { \
@ -231,10 +231,10 @@ do { \
({ \
struct spa_log *_log = l; \
enum spa_log_level _lev = _log ? _log->level : SPA_LOG_LEVEL_NONE; \
struct spa_log_topic *_t = (struct spa_log_topic *)topic; \
struct spa_log_topic *_t = (struct spa_log_topic *)(topic); \
if (_t && _t->has_custom_level) \
_lev = _t->level; \
_lev >= lev; \
_lev >= (lev); \
})
/* Transparently calls to version 0 log if v1 is not supported */
@ -302,15 +302,15 @@ do { \
#define spa_log_hexdump(l,lev,indent,data,len) \
({ \
char str[512]; \
uint8_t *buf = (uint8_t *)data; \
size_t i; \
uint8_t *buf = (uint8_t *)(data); \
size_t i, j = (len); \
int pos = 0; \
\
for (i = 0; i < len; i++) { \
for (i = 0; i < j; i++) { \
if (i % 16 == 0) \
pos = 0; \
pos += sprintf(str + pos, "%02x ", buf[i]); \
if (i % 16 == 15 || i == len - 1) \
if (i % 16 == 15 || i == j - 1) \
spa_log_lev(l,lev, "%*s" "%s",indent,"", str); \
} \
})

2
spa/include/spa/support/plugin.h
View file

@ -105,7 +105,7 @@ static inline void *spa_support_find(const struct spa_support *support,
return NULL;
}
#define SPA_SUPPORT_INIT(type,data) (struct spa_support) { (type), (data) }
#define SPA_SUPPORT_INIT(type,data) ((struct spa_support) { (type), (data) })
struct spa_handle_factory {
/** The version of this structure */