Gitweb:
https://git.exim.org/exim.git/commitdiff/fd3b39c16b3040cc7f12dbc3afdfc4e9e6e0807b
Commit: fd3b39c16b3040cc7f12dbc3afdfc4e9e6e0807b
Parent: bd94e2ae165232b3c5d92ed6e32b4ea7239a83d9
Author: Heiko Schlittermann (HS12-RIPE) <hs@???>
AuthorDate: Thu Jul 16 23:53:27 2020 +0200
Committer: Heiko Schlittermann (HS12-RIPE) <hs@???>
CommitDate: Fri Jul 17 10:05:52 2020 +0200
debug_print_socket(): output formatting
(cherry picked from exim-4.94+fixes, commit 73b748711caf8a4b18dd1c0d7c662b5d57798dfe)
---
src/src/debug.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/src/debug.c b/src/src/debug.c
index acc723a..6d6132e 100644
--- a/src/src/debug.c
+++ b/src/src/debug.c
@@ -338,7 +338,7 @@ if (fstat(fd, &s) == 0 && (s.st_mode & S_IFMT) == S_IFSOCK)
switch (a.ss_family)
{
case AF_INET:
- g = string_cat(g, US" domain AF_INET");
+ g = string_cat(g, US"domain AF_INET");
g = string_fmt_append(g, " lcl [%s]:%u",
inet_ntoa(sinp->sin_addr), ntohs(sinp->sin_port));
alen = sizeof(*sinp);
@@ -349,7 +349,7 @@ if (fstat(fd, &s) == 0 && (s.st_mode & S_IFMT) == S_IFSOCK)
case AF_INET6:
{
uschar buf[46];
- g = string_cat(g, US" domain AF_INET6");
+ g = string_cat(g, US"domain AF_INET6");
g = string_fmt_append(g, " lcl [%s]:%u",
inet_ntop(AF_INET6, &sin6p->sin6_addr, CS buf, sizeof(buf)),
ntohs(sin6p->sin6_port));
@@ -373,7 +373,7 @@ if (fstat(fd, &s) == 0 && (s.st_mode & S_IFMT) == S_IFSOCK)
sunp->sun_path[0] ? sunp->sun_path : sunp->sun_path+1);
break;
default:
- g = string_fmt_append(g, " domain %u", sinp->sin_family);
+ g = string_fmt_append(g, "domain %u", sinp->sin_family);
break;
}
if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &val, &vlen) == 0)
@@ -388,7 +388,7 @@ if (fstat(fd, &s) == 0 && (s.st_mode & S_IFMT) == S_IFSOCK)
{
struct protoent * p = getprotobynumber(val);
g = p
- ? string_fmt_append(g, " proto %s\n", p->p_name)
+ ? string_fmt_append(g, " proto %s", p->p_name)
: string_fmt_append(g, " proto %d", val);
}
#endif