mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-26 19:19:32 +03:00
Remove deadcode caused by removal of format1 arg
Commit 55abb0929e
removed the never
used format1 argument of spl_debug_msg(). That in turn resulted
in some deadcode which should be removed since it's now useless.
This commit is contained in:
parent
15b52c083e
commit
8b0eb3f0dc
@ -669,7 +669,6 @@ spl_debug_msg(void *arg, int subsys, int mask, const char *file,
|
|||||||
int max_nob;
|
int max_nob;
|
||||||
va_list ap;
|
va_list ap;
|
||||||
int i;
|
int i;
|
||||||
int remain;
|
|
||||||
|
|
||||||
if (subsys == 0)
|
if (subsys == 0)
|
||||||
subsys = SS_DEBUG_SUBSYS;
|
subsys = SS_DEBUG_SUBSYS;
|
||||||
@ -726,13 +725,8 @@ spl_debug_msg(void *arg, int subsys, int mask, const char *file,
|
|||||||
|
|
||||||
needed = 0;
|
needed = 0;
|
||||||
if (format) {
|
if (format) {
|
||||||
remain = max_nob - needed;
|
|
||||||
if (remain < 0)
|
|
||||||
remain = 0;
|
|
||||||
|
|
||||||
va_start(ap, format);
|
va_start(ap, format);
|
||||||
needed += vsnprintf(string_buf+needed, remain,
|
needed += vsnprintf(string_buf, max_nob, format, ap);
|
||||||
format, ap);
|
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -807,13 +801,10 @@ console:
|
|||||||
|
|
||||||
needed = 0;
|
needed = 0;
|
||||||
if (format != NULL) {
|
if (format != NULL) {
|
||||||
remain = TRACE_CONSOLE_BUFFER_SIZE - needed;
|
va_start(ap, format);
|
||||||
if (remain > 0) {
|
needed += vsnprintf(string_buf,
|
||||||
va_start(ap, format);
|
TRACE_CONSOLE_BUFFER_SIZE, format, ap);
|
||||||
needed += vsnprintf(string_buf+needed, remain,
|
va_end(ap);
|
||||||
format, ap);
|
|
||||||
va_end(ap);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
trace_print_to_console(&header, mask,
|
trace_print_to_console(&header, mask,
|
||||||
string_buf, needed, file, fn);
|
string_buf, needed, file, fn);
|
||||||
|
Loading…
Reference in New Issue
Block a user