diff options
Diffstat (limited to 'util-linux/mdev.c')
-rw-r--r-- | util-linux/mdev.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index 9cb3586f1..207a112c1 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c | |||
@@ -250,18 +250,24 @@ | |||
250 | 250 | ||
251 | #if DEBUG_LVL >= 1 | 251 | #if DEBUG_LVL >= 1 |
252 | # define dbg1(...) do { if (G.verbose) bb_error_msg(__VA_ARGS__); } while(0) | 252 | # define dbg1(...) do { if (G.verbose) bb_error_msg(__VA_ARGS__); } while(0) |
253 | # define dbg1s(msg) do { if (G.verbose) bb_simple_error_msg(msg); } while(0) | ||
253 | #else | 254 | #else |
254 | # define dbg1(...) ((void)0) | 255 | # define dbg1(...) ((void)0) |
256 | # define dbg1s(msg) ((void)0) | ||
255 | #endif | 257 | #endif |
256 | #if DEBUG_LVL >= 2 | 258 | #if DEBUG_LVL >= 2 |
257 | # define dbg2(...) do { if (G.verbose >= 2) bb_error_msg(__VA_ARGS__); } while(0) | 259 | # define dbg2(...) do { if (G.verbose >= 2) bb_error_msg(__VA_ARGS__); } while(0) |
260 | # define dbg2s(msg) do { if (G.verbose >= 2) bb_simple_error_msg(msg); } while(0) | ||
258 | #else | 261 | #else |
259 | # define dbg2(...) ((void)0) | 262 | # define dbg2(...) ((void)0) |
263 | # define dbg2s(msg) ((void)0) | ||
260 | #endif | 264 | #endif |
261 | #if DEBUG_LVL >= 3 | 265 | #if DEBUG_LVL >= 3 |
262 | # define dbg3(...) do { if (G.verbose >= 3) bb_error_msg(__VA_ARGS__); } while(0) | 266 | # define dbg3(...) do { if (G.verbose >= 3) bb_error_msg(__VA_ARGS__); } while(0) |
267 | # define dbg3s(msg) do { if (G.verbose >= 3) bb_simple_error_msg(msg); } while(0) | ||
263 | #else | 268 | #else |
264 | # define dbg3(...) ((void)0) | 269 | # define dbg3(...) ((void)0) |
270 | # define dbg3s(msg) ((void)0) | ||
265 | #endif | 271 | #endif |
266 | 272 | ||
267 | 273 | ||
@@ -1021,7 +1027,7 @@ wait_for_seqfile(unsigned expected_seq) | |||
1021 | /* seed file: write out seq ASAP */ | 1027 | /* seed file: write out seq ASAP */ |
1022 | xwrite_str(seq_fd, utoa(expected_seq)); | 1028 | xwrite_str(seq_fd, utoa(expected_seq)); |
1023 | xlseek(seq_fd, 0, SEEK_SET); | 1029 | xlseek(seq_fd, 0, SEEK_SET); |
1024 | dbg2("first seq written"); | 1030 | dbg2s("first seq written"); |
1025 | break; | 1031 | break; |
1026 | } | 1032 | } |
1027 | seqbufnum = atoll(seqbuf); | 1033 | seqbufnum = atoll(seqbuf); |
@@ -1165,7 +1171,7 @@ static void daemon_loop(char *temp, int fd) | |||
1165 | 1171 | ||
1166 | len = safe_read(fd, netbuf, sizeof(netbuf) - 1); | 1172 | len = safe_read(fd, netbuf, sizeof(netbuf) - 1); |
1167 | if (len < 0) { | 1173 | if (len < 0) { |
1168 | bb_perror_msg_and_die("read"); | 1174 | bb_simple_perror_msg_and_die("read"); |
1169 | } | 1175 | } |
1170 | end = netbuf + len; | 1176 | end = netbuf + len; |
1171 | *end = '\0'; | 1177 | *end = '\0'; |