diff options
| -rw-r--r-- | openbsc/src/libiu/iu.c | 11 | ||||
| -rw-r--r-- | openbsc/src/libmsc/auth.c | 13 |
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 } }; |