summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-12-16 14:16:53 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-12-21 14:02:07 +0000
commitb42dc43e288b33cb0ba467fccbe50d1de8eef878 (patch)
treeb42257e0f83f15eea76998bbe9f8619c841b54a3
parent9fdb4e5f2ff9349f5b5c60b61bfff28a05ae3e4d (diff)
use new OSMO_VALUE_STRING
libosmocore change-id I857af45ae602bb9a647ba26cf8b0d1b23403b54c adds OSMO_VALUE_STRING to compose value_string arrays with the exact enum names as entries. Use instead of identical local macros in two places. Change-Id: I1b44d2a3f293785a01d6a587c78f9e0cbeec70c3
-rw-r--r--openbsc/src/libiu/iu.c11
-rw-r--r--openbsc/src/libmsc/auth.c13
2 files changed, 11 insertions, 13 deletions
diff --git a/openbsc/src/libiu/iu.c b/openbsc/src/libiu/iu.c
index c15c6c5f3..8ba6fa49d 100644
--- a/openbsc/src/libiu/iu.c
+++ b/openbsc/src/libiu/iu.c
@@ -30,6 +30,7 @@
#include <osmocom/core/talloc.h>
#include <osmocom/core/logging.h>
#include <osmocom/core/application.h>
+#include <osmocom/core/utils.h>
#include <osmocom/vty/logging.h>
#include <osmocom/gsm/gsm48.h>
@@ -89,12 +90,10 @@ static LLIST_HEAD(ue_conn_ctx_list);
static LLIST_HEAD(rnc_list);
const struct value_string iu_event_type_names[] = {
-#define IU_EVT_STR(X) { X, #X }
- IU_EVT_STR(IU_EVENT_RAB_ASSIGN),
- IU_EVT_STR(IU_EVENT_SECURITY_MODE_COMPLETE),
- IU_EVT_STR(IU_EVENT_IU_RELEASE),
- IU_EVT_STR(IU_EVENT_LINK_INVALIDATED),
-#undef IU_EVT_STR
+ OSMO_VALUE_STRING(IU_EVENT_RAB_ASSIGN),
+ OSMO_VALUE_STRING(IU_EVENT_SECURITY_MODE_COMPLETE),
+ OSMO_VALUE_STRING(IU_EVENT_IU_RELEASE),
+ OSMO_VALUE_STRING(IU_EVENT_LINK_INVALIDATED),
{ 0, NULL }
};
diff --git a/openbsc/src/libmsc/auth.c b/openbsc/src/libmsc/auth.c
index 3b1fd738a..bf62d3c47 100644
--- a/openbsc/src/libmsc/auth.c
+++ b/openbsc/src/libmsc/auth.c
@@ -26,19 +26,18 @@
#include <openbsc/gsm_data.h>
#include <osmocom/gsm/comp128.h>
+#include <osmocom/core/utils.h>
#include <openssl/rand.h>
#include <stdlib.h>
const struct value_string auth_action_names[] = {
-#define AUTH_ACTION_STR(X) { X, #X }
- AUTH_ACTION_STR(AUTH_ERROR),
- AUTH_ACTION_STR(AUTH_NOT_AVAIL),
- AUTH_ACTION_STR(AUTH_DO_AUTH_THEN_CIPH),
- AUTH_ACTION_STR(AUTH_DO_CIPH),
- AUTH_ACTION_STR(AUTH_DO_AUTH),
-#undef AUTH_ACTION_STR
+ OSMO_VALUE_STRING(AUTH_ERROR),
+ OSMO_VALUE_STRING(AUTH_NOT_AVAIL),
+ OSMO_VALUE_STRING(AUTH_DO_AUTH_THEN_CIPH),
+ OSMO_VALUE_STRING(AUTH_DO_CIPH),
+ OSMO_VALUE_STRING(AUTH_DO_AUTH),
{ 0, NULL }
};