mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

protocol-pulse: fix two -Wformat-nonliteral warnings

Browse source 
For the stream group, we break into the three components we write out
and print those.

For the IPv6 address printing inside [], we can make this a condition on
the printf statement.
This commit is contained in:
Peter Hutterer 2021-09-06 15:37:19 +10:00
parent e55a5441b8
commit 8bb0e340c7
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/module-protocol-pulse/server.c
View file

@ -712,17 +712,16 @@ static int format_ip_address(const struct sockaddr_storage *addr, char *buffer,
{
char ip[INET6_ADDRSTRLEN];
const void *src;
const char *fmt;
bool is_ipv6 = false;
int port;
switch (addr->ss_family) {
case AF_INET:
fmt = "%s:%d";
src = &((struct sockaddr_in *) addr)->sin_addr.s_addr;
port = ntohs(((struct sockaddr_in *) addr)->sin_port);
break;
case AF_INET6:
fmt = "[%s]:%d";
is_ipv6 = true;
src = &((struct sockaddr_in6 *) addr)->sin6_addr.s6_addr;
port = ntohs(((struct sockaddr_in6 *) addr)->sin6_port);
break;
@ -733,7 +732,11 @@ static int format_ip_address(const struct sockaddr_storage *addr, char *buffer,
if (inet_ntop(addr->ss_family, src, ip, sizeof(ip)) == NULL)
return -errno;
return snprintf(buffer, buflen, fmt, ip, port);
return snprintf(buffer, buflen, "%s%s%s:%d",
is_ipv6 ? "[" : "",
ip,
is_ipv6 ? "]" : "",
port);
}
static int get_ip_address_length(const struct sockaddr_storage *addr)