Skip to content

Commit

Permalink
fix #65 cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey Lvov committed May 6, 2016
1 parent aecc7bd commit 9f5a763
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions tempesta_fw/cfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
* - Improve efficiency: too many memory allocations and data copying.
*
* Copyright (C) 2014 NatSys Lab. ([email protected]).
* Copyright (C) 2015 Tempesta Technologies, Inc.
* Copyright (C) 2015-2016 Tempesta Technologies, Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -191,7 +191,7 @@ alloc_and_copy_literal(const char *src, size_t len)
return dst;
}

static void
static inline void
print_parse_error(const TfwCfgParserState *ps)
{

Expand Down Expand Up @@ -382,10 +382,10 @@ do { \

/* Macros specific to TFSM. */

#define TFSM_MOVE(to_state) \
do { \
ps->prev_c = ps->c; \
ps->c = *(++ps->pos); \
#define TFSM_MOVE(to_state) \
do { \
ps->prev_c = ps->c; \
ps->c = *(++ps->pos); \
TFW_DBG3("tfsm move: '%c' -> '%c'\n", ps->prev_c, ps->c); \
if (ps->prev_c == '\n') { \
++ps->line; \
Expand Down Expand Up @@ -1465,7 +1465,7 @@ tfw_cfg_start_mods(const char *cfg_text, struct list_head *mod_list)
TFW_DBG2("parsing configuration and pushing it to modules...\n");
ret = tfw_cfg_parse_mods_cfg(cfg_text, mod_list);
if (ret) {
TFW_ERR("can't parse configuration data:%d\n", ret);
TFW_ERR("can't parse configuration data, %d\n", ret);
goto err_recover_cleanup;
}

Expand Down
2 changes: 1 addition & 1 deletion tempesta_fw/log.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
#define __CALLSTACK_MSG(...) \
do { \
printk(__VA_ARGS__); \
\
__WARN(); \
} while (0)

#define TFW_ERR(...) __CALLSTACK_MSG(KERN_ERR TFW_BANNER \
Expand Down

0 comments on commit 9f5a763

Please sign in to comment.