github/ocf
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #126 from mmichal10/rename-printf

Browse Source 
Rename 'printf' field name in logger ops to 'print'.
This commit is contained in:
Adam Rutkowski 2019-04-17 15:24:23 -04:00 committed by GitHub
commit c8fbb99284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/simple/src/ctx.c
View File

@ -180,7 +180,7 @@ static void ctx_metadata_updater_stop(ocf_metadata_updater_t mu)
* Function prividing interface for printing to log used by OCF internals. * Function prividing interface for printing to log used by OCF internals.
* It can handle differently messages at varous log levels. * It can handle differently messages at varous log levels.
*/ */
static int ctx_logger_printf(ocf_logger_t logger, ocf_logger_lvl_t lvl, static int ctx_logger_print(ocf_logger_t logger, ocf_logger_lvl_t lvl,
const char *fmt, va_list args) const char *fmt, va_list args)
{ {
FILE *lfile = stdout; FILE *lfile = stdout;
@ -254,7 +254,7 @@ static const struct ocf_ctx_config ctx_cfg = {
}, },
.logger = { .logger = {
.printf = ctx_logger_printf, .print = ctx_logger_print,
.dump_stack = ctx_logger_dump_stack, .dump_stack = ctx_logger_dump_stack,
}, },
}, },

4
inc/ocf_logger.h
View File

@ -31,9 +31,9 @@ typedef enum {
struct ocf_logger_ops { struct ocf_logger_ops {
int (*open)(ocf_logger_t logger); int (*open)(ocf_logger_t logger);
void (*close)(ocf_logger_t logger); void (*close)(ocf_logger_t logger);
int (*printf)(ocf_logger_t logger, ocf_logger_lvl_t lvl, int (*print)(ocf_logger_t logger, ocf_logger_lvl_t lvl,
const char *fmt, va_list args); const char *fmt, va_list args);
int (*printf_rl)(ocf_logger_t logger, const char *func_name); int (*print_rl)(ocf_logger_t logger, const char *func_name);
int (*dump_stack)(ocf_logger_t logger); int (*dump_stack)(ocf_logger_t logger);
}; };

8
src/ocf_logger.c
View File

@ -18,11 +18,11 @@ int ocf_log_raw(ocf_logger_t logger, ocf_logger_lvl_t lvl,
va_list args; va_list args;
int ret = 0; int ret = 0;
if (!logger->ops->printf) if (!logger->ops->print)
return -ENOTSUP; return -ENOTSUP;
va_start(args, fmt); va_start(args, fmt);
ret = logger->ops->printf(logger, lvl, fmt, args); ret = logger->ops->print(logger, lvl, fmt, args);
va_end(args); va_end(args);
return ret; return ret;
@ -30,10 +30,10 @@ int ocf_log_raw(ocf_logger_t logger, ocf_logger_lvl_t lvl,
int ocf_log_raw_rl(ocf_logger_t logger, const char *func_name) int ocf_log_raw_rl(ocf_logger_t logger, const char *func_name)
{ {
if (!logger->ops->printf_rl) if (!logger->ops->print_rl)
return -ENOTSUP; return -ENOTSUP;
return logger->ops->printf_rl(logger, func_name); return logger->ops->print_rl(logger, func_name);
} }
/* /*

2
src/ocf_trace.c
View File

@ -77,7 +77,7 @@ int ocf_mngt_start_trace(ocf_cache_t cache, void *trace_ctx,
ocf_trace_callback_t trace_callback) ocf_trace_callback_t trace_callback)
{ {
ocf_queue_t queue; ocf_queue_t queue;
int result; int result = 0;
OCF_CHECK_NULL(cache); OCF_CHECK_NULL(cache);

6
tests/functional/pyocf/types/logger.py
View File

@ -52,14 +52,14 @@ class LoggerOps(Structure):
CLOSE = CFUNCTYPE(None, c_void_p) CLOSE = CFUNCTYPE(None, c_void_p)
# PRINTF ommited - we cannot make variadic function call in ctypes # PRINTF ommited - we cannot make variadic function call in ctypes
LOG = CFUNCTYPE(c_int, c_void_p, c_uint, c_char_p) LOG = CFUNCTYPE(c_int, c_void_p, c_uint, c_char_p)
PRINTF_RL = CFUNCTYPE(c_int, c_void_p, c_char_p) PRINT_RL = CFUNCTYPE(c_int, c_void_p, c_char_p)
DUMP_STACK = CFUNCTYPE(c_int, c_void_p) DUMP_STACK = CFUNCTYPE(c_int, c_void_p)
_fields_ = [ _fields_ = [
("_open", OPEN), ("_open", OPEN),
("_close", CLOSE), ("_close", CLOSE),
("_printf", c_void_p), ("_print", c_void_p),
("_printf_rl", PRINTF_RL), ("_print_rl", PRINT_RL),
("_dump_stack", DUMP_STACK), ("_dump_stack", DUMP_STACK),
] ]