fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 14:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: share the static buffer for platform to_string functions

Browse source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-02-17 13:06:13 +01:00
parent 0024c72586
commit 8b294541d8
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/platform/nm-platform.c
View file

@ -1853,6 +1853,8 @@ _to_string_dev (int ifindex, char *buf, size_t size)
buf[0] = 0; buf[0] = 0;
} }
static char to_string_buffer[256];
/** /**
* nm_platform_ip4_address_to_string: * nm_platform_ip4_address_to_string:
* @route: pointer to NMPlatformIP4Address address structure * @route: pointer to NMPlatformIP4Address address structure
@ -1868,7 +1870,6 @@ _to_string_dev (int ifindex, char *buf, size_t size)
const char * const char *
nm_platform_ip4_address_to_string (const NMPlatformIP4Address *address) nm_platform_ip4_address_to_string (const NMPlatformIP4Address *address)
{ {
static char buffer[256];
char s_address[INET_ADDRSTRLEN]; char s_address[INET_ADDRSTRLEN];
char s_peer[INET_ADDRSTRLEN]; char s_peer[INET_ADDRSTRLEN];
char str_dev[TO_STRING_DEV_BUF_SIZE]; char str_dev[TO_STRING_DEV_BUF_SIZE];
@ -1885,14 +1886,14 @@ nm_platform_ip4_address_to_string (const NMPlatformIP4Address *address)
_to_string_dev (address->ifindex, str_dev, sizeof (str_dev)); _to_string_dev (address->ifindex, str_dev, sizeof (str_dev));
g_snprintf (buffer, sizeof (buffer), "%s/%d lft %u pref %u time %u%s%s src %s", g_snprintf (to_string_buffer, sizeof (to_string_buffer), "%s/%d lft %u pref %u time %u%s%s src %s",
s_address, address->plen, (guint)address->lifetime, (guint)address->preferred, s_address, address->plen, (guint)address->lifetime, (guint)address->preferred,
(guint)address->timestamp, (guint)address->timestamp,
str_peer ? str_peer : "", str_peer ? str_peer : "",
str_dev, str_dev,
source_to_string (address->source)); source_to_string (address->source));
g_free (str_peer); g_free (str_peer);
return buffer; return to_string_buffer;
} }
/** /**
@ -1910,7 +1911,6 @@ nm_platform_ip4_address_to_string (const NMPlatformIP4Address *address)
const char * const char *
nm_platform_ip6_address_to_string (const NMPlatformIP6Address *address) nm_platform_ip6_address_to_string (const NMPlatformIP6Address *address)
{ {
static char buffer[256];
char s_flags[256]; char s_flags[256];
char s_address[INET6_ADDRSTRLEN]; char s_address[INET6_ADDRSTRLEN];
char s_peer[INET6_ADDRSTRLEN]; char s_peer[INET6_ADDRSTRLEN];
@ -1947,7 +1947,7 @@ nm_platform_ip6_address_to_string (const NMPlatformIP6Address *address)
str_flags = s_flags[0] ? g_strconcat (" flags ", s_flags, NULL) : NULL; str_flags = s_flags[0] ? g_strconcat (" flags ", s_flags, NULL) : NULL;
g_snprintf (buffer, sizeof (buffer), "%s/%d lft %u pref %u time %u%s%s%s src %s", g_snprintf (to_string_buffer, sizeof (to_string_buffer), "%s/%d lft %u pref %u time %u%s%s%s src %s",
s_address, address->plen, (guint)address->lifetime, (guint)address->preferred, s_address, address->plen, (guint)address->lifetime, (guint)address->preferred,
(guint)address->timestamp, (guint)address->timestamp,
str_peer ? str_peer : "", str_peer ? str_peer : "",
@ -1956,7 +1956,7 @@ nm_platform_ip6_address_to_string (const NMPlatformIP6Address *address)
source_to_string (address->source)); source_to_string (address->source));
g_free (str_flags); g_free (str_flags);
g_free (str_peer); g_free (str_peer);
return buffer; return to_string_buffer;
} }
/** /**
@ -1974,7 +1974,6 @@ nm_platform_ip6_address_to_string (const NMPlatformIP6Address *address)
const char * const char *
nm_platform_ip4_route_to_string (const NMPlatformIP4Route *route) nm_platform_ip4_route_to_string (const NMPlatformIP4Route *route)
{ {
static char buffer[256];
char s_network[INET_ADDRSTRLEN], s_gateway[INET_ADDRSTRLEN]; char s_network[INET_ADDRSTRLEN], s_gateway[INET_ADDRSTRLEN];
char str_dev[TO_STRING_DEV_BUF_SIZE]; char str_dev[TO_STRING_DEV_BUF_SIZE];
@ -1985,12 +1984,12 @@ nm_platform_ip4_route_to_string (const NMPlatformIP4Route *route)
_to_string_dev (route->ifindex, str_dev, sizeof (str_dev)); _to_string_dev (route->ifindex, str_dev, sizeof (str_dev));
g_snprintf (buffer, sizeof (buffer), "%s/%d via %s%s metric %u mss %u src %s", g_snprintf (to_string_buffer, sizeof (to_string_buffer), "%s/%d via %s%s metric %u mss %u src %s",
s_network, route->plen, s_gateway, s_network, route->plen, s_gateway,
str_dev, str_dev,
route->metric, route->mss, route->metric, route->mss,
source_to_string (route->source)); source_to_string (route->source));
return buffer; return to_string_buffer;
} }
/** /**
@ -2008,7 +2007,6 @@ nm_platform_ip4_route_to_string (const NMPlatformIP4Route *route)
const char * const char *
nm_platform_ip6_route_to_string (const NMPlatformIP6Route *route) nm_platform_ip6_route_to_string (const NMPlatformIP6Route *route)
{ {
static char buffer[256];
char s_network[INET6_ADDRSTRLEN], s_gateway[INET6_ADDRSTRLEN]; char s_network[INET6_ADDRSTRLEN], s_gateway[INET6_ADDRSTRLEN];
char str_dev[TO_STRING_DEV_BUF_SIZE]; char str_dev[TO_STRING_DEV_BUF_SIZE];
@ -2019,12 +2017,12 @@ nm_platform_ip6_route_to_string (const NMPlatformIP6Route *route)
_to_string_dev (route->ifindex, str_dev, sizeof (str_dev)); _to_string_dev (route->ifindex, str_dev, sizeof (str_dev));
g_snprintf (buffer, sizeof (buffer), "%s/%d via %s%s metric %u mss %u src %s", g_snprintf (to_string_buffer, sizeof (to_string_buffer), "%s/%d via %s%s metric %u mss %u src %s",
s_network, route->plen, s_gateway, s_network, route->plen, s_gateway,
str_dev, str_dev,
route->metric, route->mss, route->metric, route->mss,
source_to_string (route->source)); source_to_string (route->source));
return buffer; return to_string_buffer;
} }
#define _CMP_POINTER(a, b) \ #define _CMP_POINTER(a, b) \