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
diff --git a/src/gb/common_vty.c b/src/gb/common_vty.c
index 609ab3d..5848a11 100644
--- a/src/gb/common_vty.c
+++ b/src/gb/common_vty.c
@@ -70,17 +70,17 @@
int gprs_log_filter_fn(const struct log_context *ctx,
struct log_target *tar)
{
- const struct gprs_nsvc *nsvc = ctx->ctx[LOGGING_CTX_GB_NSVC];
- const struct gprs_bvc *bvc = ctx->ctx[LOGGING_CTX_GB_BVC];
+ const struct gprs_nsvc *nsvc = ctx->ctx[LOG_CTX_GB_NSVC];
+ const struct gprs_bvc *bvc = ctx->ctx[LOG_CTX_GB_BVC];
/* Filter on the NS Virtual Connection */
- if ((tar->filter_map & (1 << LOGGING_FILTER_GB_NSVC)) != 0
- && nsvc && (nsvc == tar->filter_data[LOGGING_FILTER_GB_NSVC]))
+ if ((tar->filter_map & (1 << LOG_FLT_GB_NSVC)) != 0
+ && nsvc && (nsvc == tar->filter_data[LOG_FLT_GB_NSVC]))
return 1;
/* Filter on the NS Virtual Connection */
- if ((tar->filter_map & (1 << LOGGING_FILTER_GB_BVC)) != 0
- && bvc && (bvc == tar->filter_data[LOGGING_FILTER_GB_BVC]))
+ if ((tar->filter_map & (1 << LOG_FLT_GB_BVC)) != 0
+ && bvc && (bvc == tar->filter_data[LOG_FLT_GB_BVC]))
return 1;
return 0;