Neels Hofmeyr has uploaded this change for review. (
https://gerrit.osmocom.org/12383
Change subject: define LOGPFSM fmt only once, in LOGPFSMLSRC
......................................................................
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
---
M include/osmocom/core/fsm.h
1 file changed, 4 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/83/12383/1
diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h
index 54bbad5..ee71451 100644
--- a/include/osmocom/core/fsm.h
+++ b/include/osmocom/core/fsm.h
@@ -120,13 +120,7 @@
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 @@
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, \
--
To view, visit https://gerrit.osmocom.org/12383
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f23c57ebfdb5355919c06ac5ded7732e3b17a97
Gerrit-Change-Number: 12383
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <[email protected]>
