aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-12-20 00:00:11 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2018-12-21 23:03:53 +0100
commit8445730a4b1cbc580a6bb610176a7b271f0f62b8 (patch)
treec1860f7a5717b62228508c53b75e2d3c2d771c0d
parentcf6ee64423480137d15f6277144c1460756947dc (diff)
define LOGPFSM fmt only once, in LOGPFSMLSRC
Instead of duplicating the fmt and args in LOGPFSML and LOGPFSMLSRC, rather make LOGPFSML invoke LOGPFSMLSRC with __FILE__ and __LINE__. This is a cosmetic preparation for more tweaks coming up. Change-Id: I2f23c57ebfdb5355919c06ac5ded7732e3b17a97
-rw-r--r--include/osmocom/core/fsm.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h
index 54bbad5d..ee714519 100644
--- a/include/osmocom/core/fsm.h
+++ b/include/osmocom/core/fsm.h
@@ -120,13 +120,7 @@ struct osmo_fsm_inst {
void osmo_fsm_log_addr(bool log_addr);
#define LOGPFSML(fi, level, fmt, args...) \
- LOGP((fi)->fsm->log_subsys, OSMO_MAX(level, (fi)->log_level), \
- "%s{%s}: " fmt, \
- osmo_fsm_inst_name(fi), \
- osmo_fsm_state_name((fi)->fsm, (fi)->state), ## args)
-
-#define LOGPFSM(fi, fmt, args...) \
- LOGPFSML(fi, (fi)->log_level, fmt, ## args)
+ LOGPFSMLSRC(fi, level, __FILE__, __LINE__, fmt, ## args)
#define LOGPFSMLSRC(fi, level, caller_file, caller_line, fmt, args...) \
LOGPSRC((fi)->fsm->log_subsys, level, \
@@ -136,6 +130,9 @@ void osmo_fsm_log_addr(bool log_addr);
osmo_fsm_state_name((fi)->fsm, (fi)->state), \
## args)
+#define LOGPFSM(fi, fmt, args...) \
+ LOGPFSML(fi, (fi)->log_level, fmt, ## args)
+
#define LOGPFSMSRC(fi, caller_file, caller_line, fmt, args...) \
LOGPFSMLSRC(fi, (fi)->log_level, \
caller_file, caller_line, \