From 05ed7e849c676eb8bf6c6da93c55da994d6f0ba9 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 17 Nov 2022 07:55:44 +0100 Subject: [PATCH] DEV: poll: strip the "do_" prefix from reported function names This doesn't bring anything and makes the output less readable. Let's just keep the action name. --- dev/poll/poll.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dev/poll/poll.c b/dev/poll/poll.c index 91db039d8..649938f08 100644 --- a/dev/poll/poll.c +++ b/dev/poll/poll.c @@ -89,7 +89,7 @@ void do_acc(int fd) if (sfd < 0) sfd = ret; if (verbose) - printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__, fd, ret, get_errno(ret)); + printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); } void do_con(int fd) @@ -98,7 +98,7 @@ void do_con(int fd) ret = connect(cfd, (const struct sockaddr*)&saddr, salen); if (verbose) - printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__, fd, ret, get_errno(ret)); + printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); connected = 1; } @@ -108,7 +108,7 @@ void do_snd(int fd) ret = send(fd, "foo", 3, MSG_NOSIGNAL|MSG_DONTWAIT); if (verbose) - printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__, fd, ret, get_errno(ret)); + printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); } void do_mor(int fd) @@ -117,7 +117,7 @@ void do_mor(int fd) ret = send(fd, "foo", 3, MSG_NOSIGNAL|MSG_DONTWAIT|MSG_MORE); if (verbose) - printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__, fd, ret, get_errno(ret)); + printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); } void do_rcv(int fd) @@ -127,7 +127,7 @@ void do_rcv(int fd) ret = recv(fd, buf, sizeof(buf), MSG_DONTWAIT); if (verbose) - printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__, fd, ret, get_errno(ret)); + printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); } void do_drn(int fd) @@ -146,7 +146,7 @@ void do_drn(int fd) } if (verbose) - printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__, fd, total, get_errno(ret)); + printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, total, get_errno(ret)); } void do_shr(int fd) @@ -155,7 +155,7 @@ void do_shr(int fd) ret = shutdown(fd, SHUT_RD); if (verbose) - printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__, fd, ret, get_errno(ret)); + printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); } void do_shw(int fd) @@ -164,7 +164,7 @@ void do_shw(int fd) ret = shutdown(fd, SHUT_WR); if (verbose) - printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__, fd, ret, get_errno(ret)); + printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); } void do_shb(int fd) @@ -173,7 +173,7 @@ void do_shb(int fd) ret = shutdown(fd, SHUT_RDWR); if (verbose) - printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__, fd, ret, get_errno(ret)); + printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); } void do_lin(int fd) @@ -183,7 +183,7 @@ void do_lin(int fd) ret = setsockopt(fd, SOL_SOCKET, SO_LINGER, &nolinger, sizeof(nolinger)); if (verbose) - printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__, fd, ret, get_errno(ret)); + printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); } void do_clo(int fd) @@ -192,7 +192,7 @@ void do_clo(int fd) ret = close(fd); if (verbose) - printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__, fd, ret, get_errno(ret)); + printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); } void do_pol(int fd) @@ -202,7 +202,7 @@ void do_pol(int fd) ret = poll(&fds, 1, 0); if (verbose) { - printf("cmd #%d stp #%d: %s(%d): ret=%d%s ev=%#x ", cmd, cmdstep, __FUNCTION__, fd, ret, get_errno(ret), ret > 0 ? fds.revents : 0); + printf("cmd #%d stp #%d: %s(%d): ret=%d%s ev=%#x ", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret), ret > 0 ? fds.revents : 0); if (ret > 0 && fds.revents) { int flags, flag; putchar('(');