logging.h: fixup: shorter names for LOGGING_FILTER_* and LOGGING_CTX_*

My recent logging patch was merged to master a bit too soon. Accomodate the
request for naming that matches the general "LOG" prefix instead of "LOGGING".

libosmocore will not be backwards-compatible with the few commits from
change-id I5c343630020f4b108099696fd96c2111614c8067 up to this one. This and
following commits are backwards compatible with those before that short window.

See also:
* openbsc change-id Ib2ec5e4884aa90f48051ee2f832af557aa525991
* osmo-pcu change-id I4db4a668f2be07f3d55f848d38d1b490d8a7a685

Change-Id: I424fe3f12ea620338902b2bb8230544bde3f1a93

1 files changed, 18 insertions, 16 deletions

diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h
index c4d80065..7b28b2c8 100644
--- a/include/osmocom/core/logging.h
+++ b/include/osmocom/core/logging.h
@@ -126,32 +126,34 @@ struct log_context {
 
 /*! \brief Indexes to indicate the object currently acted upon.
  * Array indexes for the global \a log_context array. */
-enum logging_ctx_items {
-	LOGGING_CTX_GB_NSVC,
-	LOGGING_CTX_GB_BVC,
-	LOGGING_CTX_BSC_SUBSCR,
-	LOGGING_CTX_VLR_SUBSCR,
-	_LOGGING_CTX_COUNT
+enum log_ctx_index {
+	LOG_CTX_GB_NSVC,
+	LOG_CTX_GB_BVC,
+	LOG_CTX_BSC_SUBSCR,
+	LOG_CTX_VLR_SUBSCR,
+	_LOG_CTX_COUNT
 };
 
 /*! \brief Indexes to indicate objects that should be logged.
  * Array indexes to log_target->filter_data and bit indexes for
  * log_target->filter_map. */
-enum logging_filters {
-	LOGGING_FILTER_ALL,
-	LOGGING_FILTER_GB_NSVC,
-	LOGGING_FILTER_GB_BVC,
-	LOGGING_FILTER_BSC_SUBSCR,
-	LOGGING_FILTER_VLR_SUBSCR,
-	_LOGGING_FILTER_COUNT
+enum log_filter_index {
+	LOG_FLT_ALL,
+	LOG_FLT_GB_NSVC,
+	LOG_FLT_GB_BVC,
+	LOG_FLT_BSC_SUBSCR,
+	LOG_FLT_VLR_SUBSCR,
+	_LOG_FLT_COUNT
 };
 
 /*! \brief Compatibility with older libosmocore versions */
-#define LOG_FILTER_ALL (1<<LOGGING_FILTER_ALL)
+#define LOG_FILTER_ALL (1<<LOG_FLT_ALL)
 /*! \brief Compatibility with older libosmocore versions */
-#define GPRS_CTX_NSVC LOGGING_CTX_GB_NSVC
+#define GPRS_CTX_NSVC LOG_CTX_GB_NSVC
 /*! \brief Compatibility with older libosmocore versions */
-#define GPRS_CTX_BVC LOGGING_CTX_GB_BVC
+#define GPRS_CTX_BVC LOG_CTX_GB_BVC
+/*! \brief Indexes to indicate the object currently acted upon.
+ * Array indexes for the global \a log_context array. */
 
 struct log_target;