projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Proper size return from output buffers
[fio.git]
/
log.c
diff --git
a/log.c
b/log.c
index 78b3e7a79c05fb84d5be8594d46344a6ed927c21..e3ca29cd2c388f1c861e1663599f39acebad650c 100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-6,7
+6,7
@@
#include "fio.h"
#include "fio.h"
-
in
t log_valist(const char *str, va_list args)
+
size_
t log_valist(const char *str, va_list args)
{
char buffer[1024];
size_t len;
{
char buffer[1024];
size_t len;
@@
-24,7
+24,7
@@
int log_valist(const char *str, va_list args)
return len;
}
return len;
}
-
in
t log_local_buf(const char *buf, size_t len)
+
size_
t log_local_buf(const char *buf, size_t len)
{
if (log_syslog)
syslog(LOG_INFO, "%s", buf);
{
if (log_syslog)
syslog(LOG_INFO, "%s", buf);
@@
-34,7
+34,7
@@
int log_local_buf(const char *buf, size_t len)
return len;
}
return len;
}
-
in
t log_info(const char *format, ...)
+
size_
t log_info(const char *format, ...)
{
char buffer[1024];
va_list args;
{
char buffer[1024];
va_list args;
@@
-54,7
+54,7
@@
int log_info(const char *format, ...)
return fwrite(buffer, len, 1, f_out);
}
return fwrite(buffer, len, 1, f_out);
}
-
in
t __log_buf(struct buf_output *buf, const char *format, ...)
+
size_
t __log_buf(struct buf_output *buf, const char *format, ...)
{
char buffer[1024];
va_list args;
{
char buffer[1024];
va_list args;
@@
-65,8
+65,7
@@
int __log_buf(struct buf_output *buf, const char *format, ...)
va_end(args);
len = min(len, sizeof(buffer) - 1);
va_end(args);
len = min(len, sizeof(buffer) - 1);
- buf_output_add(buf, buffer, len);
- return 0;
+ return buf_output_add(buf, buffer, len);
}
int log_info_flush(void)
}
int log_info_flush(void)
@@
-77,7
+76,7
@@
int log_info_flush(void)
return fflush(f_out);
}
return fflush(f_out);
}
-
in
t log_err(const char *format, ...)
+
size_
t log_err(const char *format, ...)
{
char buffer[1024];
va_list args;
{
char buffer[1024];
va_list args;