2
0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-04 00:05:26 +00:00

Use stderr for debug messages (v2)

Many programs use stdout for transferring data.

v2: remove debug code

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Acked-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
This commit is contained in:
Andrey Vagin
2011-12-05 12:01:23 +04:00
committed by Cyrill Gorcunov
parent 53c611b630
commit e57a4c2945
2 changed files with 14 additions and 10 deletions

View File

@@ -185,7 +185,7 @@ struct rt_sigframe {
static void always_inline write_char(char c) static void always_inline write_char(char c)
{ {
sys_write(1, &c, 1); sys_write(STDERR_FILENO, &c, 1);
} }
static void always_inline write_string(char *str) static void always_inline write_string(char *str)
@@ -195,7 +195,7 @@ static void always_inline write_string(char *str)
while (str[len]) while (str[len])
len++; len++;
sys_write(1, str, len); sys_write(STDERR_FILENO, str, len);
} }
static void always_inline write_string_n(char *str) static void always_inline write_string_n(char *str)
@@ -203,7 +203,7 @@ static void always_inline write_string_n(char *str)
char new_line = '\n'; char new_line = '\n';
write_string(str); write_string(str);
sys_write(1, &new_line, 1); sys_write(STDERR_FILENO, &new_line, 1);
} }
static void always_inline write_num_n(long num) static void always_inline write_num_n(long num)
@@ -216,7 +216,7 @@ static void always_inline write_num_n(long num)
if (num < 0) { if (num < 0) {
num = -num; num = -num;
c = '-'; c = '-';
sys_write(1, &c, 1); sys_write(STDERR_FILENO, &c, 1);
} }
while (d) { while (d) {
@@ -228,11 +228,11 @@ static void always_inline write_num_n(long num)
if (!started) if (!started)
started = 1; started = 1;
add_ord(c); add_ord(c);
sys_write(1, &c, 1); sys_write(STDERR_FILENO, &c, 1);
} }
c = '\n'; c = '\n';
sys_write(1, &c, 1); sys_write(STDERR_FILENO, &c, 1);
} }
static long always_inline vprint_num(char *buf, long num) static long always_inline vprint_num(char *buf, long num)
@@ -273,19 +273,19 @@ static void always_inline write_hex_n(unsigned long num)
int i; int i;
c = 'x'; c = 'x';
sys_write(1, &c, 1); sys_write(STDERR_FILENO, &c, 1);
for (i = sizeof(long)/sizeof(char) - 1; i >= 0; i--) { for (i = sizeof(long)/sizeof(char) - 1; i >= 0; i--) {
c = (s[i] & 0xf0) >> 4; c = (s[i] & 0xf0) >> 4;
add_ord(c); add_ord(c);
sys_write(1, &c, 1); sys_write(STDERR_FILENO, &c, 1);
c = (s[i] & 0x0f); c = (s[i] & 0x0f);
add_ord(c); add_ord(c);
sys_write(1, &c, 1); sys_write(STDERR_FILENO, &c, 1);
} }
c = '\n'; c = '\n';
sys_write(1, &c, 1); sys_write(STDERR_FILENO, &c, 1);
} }
#define FUTEX_WAIT 0 #define FUTEX_WAIT 0

View File

@@ -7,6 +7,10 @@
#include "bitops.h" #include "bitops.h"
#include "atomic.h" #include "atomic.h"
#define STDIN_FILENO 0
#define STDOUT_FILENO 1
#define STDERR_FILENO 2
/* prctl */ /* prctl */
#define ARCH_SET_GS 0x1001 #define ARCH_SET_GS 0x1001
#define ARCH_SET_FS 0x1002 #define ARCH_SET_FS 0x1002