Merge pull request #8 from wolszews/remove-log-prefix

Remove OCF prefix
This commit is contained in:
Michał Mielewczyk 2018-12-07 15:40:47 +01:00 committed by GitHub
commit c0079e4d77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 5 deletions

View File

@ -585,7 +585,7 @@ static int _ocf_engine_refresh(struct ocf_request *rq)
else else
ENV_BUG(); ENV_BUG();
} else { } else {
ENV_WARN(true, OCF_PREFIX_SHORT" Inconsistent request"); ENV_WARN(true, "Inconsistent request");
rq->error = -EINVAL; rq->error = -EINVAL;
/* Complete request */ /* Complete request */

View File

@ -33,7 +33,7 @@ struct ocf_ctx {
}; };
#define ocf_log_prefix(ctx, lvl, prefix, fmt, ...) \ #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, ...) \ #define ocf_log(ctx, lvl, fmt, ...) \
ocf_log_prefix(ctx, lvl, "", fmt, ##__VA_ARGS__) ocf_log_prefix(ctx, lvl, "", fmt, ##__VA_ARGS__)

View File

@ -119,7 +119,7 @@ void env_allocator_destroy(env_allocator *allocator)
if (allocator) { if (allocator) {
if (env_atomic_read(&allocator->count)) { if (env_atomic_read(&allocator->count)) {
fprintf(stderr, "Not all object deallocated\n"); 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); free(allocator->name);

View File

@ -13,8 +13,6 @@
#define __USE_GNU #define __USE_GNU
#endif #endif
#define OCF_PREFIX_SHORT "OCF"
#include <linux/limits.h> #include <linux/limits.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#include <stdint.h> #include <stdint.h>