Just provide one handler that does the va args and buffer
printing/allocation, and make the rest of them use that.
Signed-off-by: Jens Axboe <axboe@fb.com>
return fwrite(buf, len, 1, f_out);
}
return fwrite(buf, len, 1, f_out);
}
-size_t log_valist(const char *str, va_list args)
+static size_t valist_to_buf(char **buffer, const char *fmt, va_list src_args)
{
size_t len, cur = LOG_START_SZ;
{
size_t len, cur = LOG_START_SZ;
- buffer = calloc(1, cur);
+ *buffer = calloc(1, cur);
+
+ va_copy(args, src_args);
+ len = vsnprintf(*buffer, cur, fmt, args);
+ va_end(args);
- len = vsnprintf(buffer, cur, str, args);
if (len < cur)
break;
cur = len + 1;
if (len < cur)
break;
cur = len + 1;
- cur = log_info_buf(buffer, len);
- free(buffer);
-
- return cur;
-size_t log_info(const char *format, ...)
+size_t log_valist(const char *fmt, va_list args)
- size_t len, cur = LOG_START_SZ;
- va_list args;
-
- do {
- buffer = calloc(1, cur);
- va_start(args, format);
- len = vsnprintf(buffer, cur, format, args);
- va_end(args);
+ len = valist_to_buf(&buffer, fmt, args);
+ len = log_info_buf(buffer, len);
+ free(buffer);
- if (len < cur)
- break;
- cur = len + 1;
- free(buffer);
- } while (1);
+size_t log_info(const char *format, ...)
+{
+ va_list args;
+ size_t ret;
- cur = log_info_buf(buffer, len);
- free(buffer);
+ va_start(args, format);
+ ret = log_valist(format, args);
+ va_end(args);
}
size_t __log_buf(struct buf_output *buf, const char *format, ...)
{
}
size_t __log_buf(struct buf_output *buf, const char *format, ...)
{
- size_t len, cur = LOG_START_SZ;
char *buffer;
va_list args;
char *buffer;
va_list args;
- do {
- buffer = calloc(1, cur);
-
- va_start(args, format);
- len = vsnprintf(buffer, cur, format, args);
- va_end(args);
-
- if (len < cur)
- break;
-
- cur = len + 1;
- free(buffer);
- } while (1);
+ va_start(args, format);
+ len = valist_to_buf(&buffer, format, args);
+ va_end(args);
- cur = buf_output_add(buf, buffer, len);
+ len = buf_output_add(buf, buffer, len);
}
int log_info_flush(void)
}
int log_info_flush(void)
size_t log_err(const char *format, ...)
{
size_t log_err(const char *format, ...)
{
- size_t ret, len, cur = LOG_START_SZ;
char *buffer;
va_list args;
char *buffer;
va_list args;
- do {
- buffer = calloc(1, cur);
-
- va_start(args, format);
- len = vsnprintf(buffer, cur, format, args);
- va_end(args);
-
- if (len < cur)
- break;
-
- cur = len + 1;
- free(buffer);
- } while (1);
-
+ va_start(args, format);
+ len = valist_to_buf(&buffer, format, args);
+ va_end(args);
if (is_backend) {
ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);
if (is_backend) {
ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);