BUPT-OS
/
libevl
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/proxy: output calls should return ssize_t for consistency

This commit is contained in:
Philippe Gerum 2020-02-14 18:59:57 +01:00
parent 5d360c615c
commit 278f8d308f
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/evl/proxy.h
View File

@ -23,13 +23,13 @@ int evl_new_proxy(int targetfd, size_t bufsz,
ssize_t evl_send_proxy(int proxyfd,
const void *buf, size_t count);
int evl_vprint_proxy(int proxyfd,
const char *fmt, va_list ap);
ssize_t evl_vprint_proxy(int proxyfd,
const char *fmt, va_list ap);
int evl_print_proxy(int proxyfd,
const char *fmt, ...);
ssize_t evl_print_proxy(int proxyfd,
const char *fmt, ...);
int evl_printf(const char *fmt, ...);
ssize_t evl_printf(const char *fmt, ...);
extern int proxy_outfd,
proxy_errfd;

15
lib/proxy.c
View File

@ -69,10 +69,9 @@ ssize_t evl_send_proxy(int proxyfd, const void *buf, size_t count)
return ret < 0 ? -errno : ret;
}
int evl_vprint_proxy(int proxyfd, const char *fmt, va_list ap)
ssize_t evl_vprint_proxy(int proxyfd, const char *fmt, va_list ap)
{
ssize_t count = vsnprintf(fmt_buf, sizeof(fmt_buf), fmt, ap);
int ret;
ssize_t count = vsnprintf(fmt_buf, sizeof(fmt_buf), fmt, ap), ret;
if (count < 0)
return -errno; /* assume POSIX behavior. */
@ -90,16 +89,16 @@ int evl_vprint_proxy(int proxyfd, const char *fmt, va_list ap)
ret = -EBADFD;
}
} else {
ret = (int)evl_send_proxy(proxyfd, fmt_buf, count);
ret = evl_send_proxy(proxyfd, fmt_buf, count);
}
return ret;
}
int evl_print_proxy(int proxyfd, const char *fmt, ...)
ssize_t evl_print_proxy(int proxyfd, const char *fmt, ...)
{
ssize_t ret;
va_list ap;
int ret;
va_start(ap, fmt);
ret = evl_vprint_proxy(proxyfd, fmt, ap);
@ -108,10 +107,10 @@ int evl_print_proxy(int proxyfd, const char *fmt, ...)
return ret;
}
int evl_printf(const char *fmt, ...)
ssize_t evl_printf(const char *fmt, ...)
{
ssize_t ret;
va_list ap;
int ret;
va_start(ap, fmt);
ret = evl_vprint_proxy(proxy_outfd, fmt, ap);