[MERGED] libosmocore[master]: utils.h: add OSMO_STRINGIFY and OSMO_VALUE_STRING macros

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: utils.h: add OSMO_STRINGIFY and OSMO_VALUE_STRING macros
......................................................................


utils.h: add OSMO_STRINGIFY and OSMO_VALUE_STRING macros

OSMO_STRINGIFY particularly allows putting port numbers from a #define into VTY
doc strings, like:

  #define FOO_PORT 2342
  DEFUN(...,
        "Foo UDP port (default: " OSMO_STRINGIFY(FOO_PORT) ")\n")

OSMO_VALUE_STRING creates value_string items with the string being exactly the
enum value's name. Replaces a similar macro def in fsm.c

Change-Id: I857af45ae602bb9a647ba26cf8b0d1b23403b54c
---
M include/osmocom/core/utils.h
M src/fsm.c
2 files changed, 9 insertions(+), 7 deletions(-)

Approvals:
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h
index 3c6fc98..41bbc27 100644
--- a/include/osmocom/core/utils.h
+++ b/include/osmocom/core/utils.h
@@ -15,6 +15,10 @@
 #define OSMO_MAX(a, b) ((a) >= (b) ? (a) : (b))
 /*! \brief Return the minimum of two specified values */
 #define OSMO_MIN(a, b) ((a) >= (b) ? (b) : (a))
+/*! \brief Stringify the contents of a macro, e.g. a port number */
+#define OSMO_STRINGIFY(x) #x
+/*! \brief Make a value_string entry from an enum value name */
+#define OSMO_VALUE_STRING(x) { x, OSMO_STRINGIFY(x) }
 
 #include <stdint.h>
 
diff --git a/src/fsm.c b/src/fsm.c
index 16699fa..842c766 100644
--- a/src/fsm.c
+++ b/src/fsm.c
@@ -476,14 +476,12 @@
 					file, line);
 }
 
-#define ENUM_VAL_TO_VALUE_STRING(X) { X, #X }
-
 const struct value_string osmo_fsm_term_cause_names[] = {
-	ENUM_VAL_TO_VALUE_STRING(OSMO_FSM_TERM_PARENT),
-	ENUM_VAL_TO_VALUE_STRING(OSMO_FSM_TERM_REQUEST),
-	ENUM_VAL_TO_VALUE_STRING(OSMO_FSM_TERM_REGULAR),
-	ENUM_VAL_TO_VALUE_STRING(OSMO_FSM_TERM_ERROR),
-	ENUM_VAL_TO_VALUE_STRING(OSMO_FSM_TERM_TIMEOUT),
+	OSMO_VALUE_STRING(OSMO_FSM_TERM_PARENT),
+	OSMO_VALUE_STRING(OSMO_FSM_TERM_REQUEST),
+	OSMO_VALUE_STRING(OSMO_FSM_TERM_REGULAR),
+	OSMO_VALUE_STRING(OSMO_FSM_TERM_ERROR),
+	OSMO_VALUE_STRING(OSMO_FSM_TERM_TIMEOUT),
 	{ 0, NULL }
 };
 

-- 
To view, visit https://gerrit.osmocom.org/1440
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I857af45ae602bb9a647ba26cf8b0d1b23403b54c
Gerrit-PatchSet: 4
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>