Commit 52a2c9fd authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

restorer: unify log functions

Add ability to use the same macros in restorer code.
In the future we will add ability to show arguments like printf.
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 667953c0
...@@ -9,18 +9,17 @@ extern void write_hex_n_on_level(unsigned int loglevel, unsigned long num); ...@@ -9,18 +9,17 @@ extern void write_hex_n_on_level(unsigned int loglevel, unsigned long num);
extern void write_num_n_on_level(unsigned int loglevel, long num); extern void write_num_n_on_level(unsigned int loglevel, long num);
extern void write_num_on_level(unsigned int loglevel, long num); extern void write_num_on_level(unsigned int loglevel, long num);
extern void write_str_n_on_level(unsigned int loglevel, char *str); extern void write_str_n_on_level(unsigned int loglevel, char *str);
extern void write_str_on_level(unsigned int loglevel, char *str);
extern void restorer_set_logfd(int fd); extern void restorer_set_logfd(int fd);
extern void restorer_set_loglevel(unsigned int loglevel); extern void restorer_set_loglevel(unsigned int loglevel);
#define write_str_err(str) write_str_on_level(LOG_ERROR, str) #define write_str_err(str) print_on_level(LOG_ERROR, str)
#define write_str_n_err(str) write_str_n_on_level(LOG_ERROR, str) #define write_str_n_err(str) write_str_n_on_level(LOG_ERROR, str)
#define write_num_err(num) write_num_on_level(LOG_ERROR, num) #define write_num_err(num) write_num_on_level(LOG_ERROR, num)
#define write_num_n_err(num) write_num_n_on_level(LOG_ERROR, num) #define write_num_n_err(num) write_num_n_on_level(LOG_ERROR, num)
#define write_str_info(str) write_str_on_level(LOG_INFO, str) #define write_str_info(str) print_on_level(LOG_INFO, str)
#define write_str_n_info(str) write_str_n_on_level(LOG_INFO, str) #define write_str_n_info(str) write_str_n_on_level(LOG_INFO, str)
#define write_num_info(num) write_num_on_level(LOG_INFO, num) #define write_num_info(num) write_num_on_level(LOG_INFO, num)
......
...@@ -22,7 +22,7 @@ void restorer_set_loglevel(unsigned int loglevel) ...@@ -22,7 +22,7 @@ void restorer_set_loglevel(unsigned int loglevel)
current_loglevel = loglevel; current_loglevel = loglevel;
} }
static void write_str(char *str) static void write_str(const char *str)
{ {
int len = 0; int len = 0;
...@@ -32,7 +32,7 @@ static void write_str(char *str) ...@@ -32,7 +32,7 @@ static void write_str(char *str)
sys_write(current_logfd, str, len); sys_write(current_logfd, str, len);
} }
void write_str_on_level(unsigned int loglevel, char *str) void print_on_level(unsigned int loglevel, const char *str, ...)
{ {
if (loglevel > current_loglevel) if (loglevel > current_loglevel)
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment