From 0cb11b0d3c1ad3fa3049ccef86e4c7548a75f219 Mon Sep 17 00:00:00 2001 From: wolszews Date: Thu, 6 Dec 2018 15:44:17 +0100 Subject: [PATCH] Remove OCF prefix --- src/engine/engine_common.c | 2 +- src/ocf_ctx_priv.h | 2 +- tests/ut/ocf_env/ocf_env.c | 2 +- tests/ut/ocf_env/ocf_env.h | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/engine/engine_common.c b/src/engine/engine_common.c index 7e7ee09..8dec278 100644 --- a/src/engine/engine_common.c +++ b/src/engine/engine_common.c @@ -585,7 +585,7 @@ static int _ocf_engine_refresh(struct ocf_request *rq) else ENV_BUG(); } else { - ENV_WARN(true, OCF_PREFIX_SHORT" Inconsistent request"); + ENV_WARN(true, "Inconsistent request"); rq->error = -EINVAL; /* Complete request */ diff --git a/src/ocf_ctx_priv.h b/src/ocf_ctx_priv.h index 7317ed6..d3b0728 100644 --- a/src/ocf_ctx_priv.h +++ b/src/ocf_ctx_priv.h @@ -33,7 +33,7 @@ struct ocf_ctx { }; #define ocf_log_prefix(ctx, lvl, prefix, fmt, ...) \ - ocf_log_raw(ctx->logger, lvl, OCF_PREFIX_SHORT prefix fmt, ##__VA_ARGS__) + ocf_log_raw(ctx->logger, lvl, prefix fmt, ##__VA_ARGS__) #define ocf_log(ctx, lvl, fmt, ...) \ ocf_log_prefix(ctx, lvl, "", fmt, ##__VA_ARGS__) diff --git a/tests/ut/ocf_env/ocf_env.c b/tests/ut/ocf_env/ocf_env.c index 6d0b915..c3ea698 100644 --- a/tests/ut/ocf_env/ocf_env.c +++ b/tests/ut/ocf_env/ocf_env.c @@ -119,7 +119,7 @@ void env_allocator_destroy(env_allocator *allocator) if (allocator) { if (env_atomic_read(&allocator->count)) { fprintf(stderr, "Not all object deallocated\n"); - ENV_WARN(true, OCF_PREFIX_SHORT" Cleanup problem\n"); + ENV_WARN(true, "Cleanup problem\n"); } free(allocator->name); diff --git a/tests/ut/ocf_env/ocf_env.h b/tests/ut/ocf_env/ocf_env.h index b2c9d65..6c4092a 100644 --- a/tests/ut/ocf_env/ocf_env.h +++ b/tests/ut/ocf_env/ocf_env.h @@ -13,8 +13,6 @@ #define __USE_GNU #endif -#define OCF_PREFIX_SHORT "OCF" - #include #include #include