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

all: use "NM_UTILS_TO_STRING_BUFFER_SIZE" macro

Browse source
This commit is contained in:
Thomas Haller 2022-03-30 09:23:54 +02:00
parent 36e709c021
commit 02a8d21e4e
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
12 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/devices/nm-device.c
View file

@ -10448,7 +10448,7 @@ void
nm_device_use_ip6_subnet(NMDevice *self, const NMPlatformIP6Address *subnet) nm_device_use_ip6_subnet(NMDevice *self, const NMPlatformIP6Address *subnet)
{ {
nm_auto_unref_l3cd_init NML3ConfigData *l3cd = NULL; nm_auto_unref_l3cd_init NML3ConfigData *l3cd = NULL;
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
NMPlatformIP6Address address; NMPlatformIP6Address address;
l3cd = nm_device_create_l3_config_data(self, NM_IP_CONFIG_SOURCE_SHARED); l3cd = nm_device_create_l3_config_data(self, NM_IP_CONFIG_SOURCE_SHARED);

2
src/core/devices/wwan/nm-modem-broadband.c
View file

@ -957,7 +957,7 @@ stage3_ip_config_start(NMModem *modem, int addr_family, NMModemIPMethod ip_metho
const int IS_IPv4 = NM_IS_IPv4(addr_family); const int IS_IPv4 = NM_IS_IPv4(addr_family);
NMModemBroadband *self = NM_MODEM_BROADBAND(modem); NMModemBroadband *self = NM_MODEM_BROADBAND(modem);
nm_auto_unref_l3cd_init NML3ConfigData *l3cd = NULL; nm_auto_unref_l3cd_init NML3ConfigData *l3cd = NULL;
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
gs_free_error GError *error = NULL; gs_free_error GError *error = NULL;
const char *data_port; const char *data_port;
const char *address_string; const char *address_string;

2
src/core/devices/wwan/nm-modem-ofono.c
View file

@ -734,7 +734,7 @@ handle_settings(GVariant *v_dict, gpointer user_data)
{ {
NMModemOfono *self = NM_MODEM_OFONO(user_data); NMModemOfono *self = NM_MODEM_OFONO(user_data);
NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE(self); NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE(self);
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
NMPlatformIP4Address address; NMPlatformIP4Address address;
gboolean ret = FALSE; gboolean ret = FALSE;
const char *interface; const char *interface;

2
src/core/nm-l3-config-data.c
View file

@ -349,7 +349,7 @@ nm_l3_config_data_log(const NML3ConfigData *self,
NMLogLevel log_level, NMLogLevel log_level,
NMLogDomain log_domain) NMLogDomain log_domain)
{ {
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
char sbuf_addr[NM_UTILS_INET_ADDRSTRLEN]; char sbuf_addr[NM_UTILS_INET_ADDRSTRLEN];
int IS_IPv4; int IS_IPv4;
guint i; guint i;

14
src/core/nm-l3cfg.c
View file

@ -585,7 +585,7 @@ _l3_config_notify_data_to_string(const NML3ConfigNotifyData *notify_data,
void void
_nm_l3cfg_emit_signal_notify(NML3Cfg *self, const NML3ConfigNotifyData *notify_data) _nm_l3cfg_emit_signal_notify(NML3Cfg *self, const NML3ConfigNotifyData *notify_data)
{ {
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
nm_assert(notify_data); nm_assert(notify_data);
nm_assert(_NM_INT_NOT_NEGATIVE(notify_data->notify_type)); nm_assert(_NM_INT_NOT_NEGATIVE(notify_data->notify_type));
@ -885,7 +885,7 @@ _obj_state_data_update(ObjStateData *obj_state, const NMPObject *obj)
static void static void
_obj_states_externally_removed_track(NML3Cfg *self, const NMPObject *obj, gboolean in_platform) _obj_states_externally_removed_track(NML3Cfg *self, const NMPObject *obj, gboolean in_platform)
{ {
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
ObjStateData *obj_state; ObjStateData *obj_state;
nm_assert(NM_IS_L3CFG(self)); nm_assert(NM_IS_L3CFG(self));
@ -946,7 +946,7 @@ _obj_states_update_all(NML3Cfg *self)
NMP_OBJECT_TYPE_IP4_ROUTE, NMP_OBJECT_TYPE_IP4_ROUTE,
NMP_OBJECT_TYPE_IP6_ROUTE, NMP_OBJECT_TYPE_IP6_ROUTE,
}; };
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
ObjStateData *obj_state; ObjStateData *obj_state;
int i; int i;
gboolean any_dirty = FALSE; gboolean any_dirty = FALSE;
@ -1037,7 +1037,7 @@ typedef struct {
static gboolean static gboolean
_obj_states_sync_filter(NML3Cfg *self, const NMPObject *obj, NML3CfgCommitType commit_type) _obj_states_sync_filter(NML3Cfg *self, const NMPObject *obj, NML3CfgCommitType commit_type)
{ {
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
NMPObjectType obj_type; NMPObjectType obj_type;
ObjStateData *obj_state; ObjStateData *obj_state;
@ -1152,7 +1152,7 @@ _obj_state_zombie_lst_get_prune_lists(NML3Cfg *self,
const int IS_IPv4 = NM_IS_IPv4(addr_family); const int IS_IPv4 = NM_IS_IPv4(addr_family);
const NMPObjectType obj_type_route = NMP_OBJECT_TYPE_IP_ROUTE(IS_IPv4); const NMPObjectType obj_type_route = NMP_OBJECT_TYPE_IP_ROUTE(IS_IPv4);
const NMPObjectType obj_type_address = NMP_OBJECT_TYPE_IP_ADDRESS(IS_IPv4); const NMPObjectType obj_type_address = NMP_OBJECT_TYPE_IP_ADDRESS(IS_IPv4);
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
ObjStateData *obj_state; ObjStateData *obj_state;
ObjStateData *obj_state_safe; ObjStateData *obj_state_safe;
@ -1198,7 +1198,7 @@ _obj_state_zombie_lst_get_prune_lists(NML3Cfg *self,
static void static void
_obj_state_zombie_lst_prune_all(NML3Cfg *self, int addr_family) _obj_state_zombie_lst_prune_all(NML3Cfg *self, int addr_family)
{ {
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
ObjStateData *obj_state; ObjStateData *obj_state;
ObjStateData *obj_state_safe; ObjStateData *obj_state_safe;
@ -3857,7 +3857,7 @@ _routes_temporary_not_available_update(NML3Cfg *self,
for (i = 0; i < routes_temporary_not_available_arr->len; i++) { for (i = 0; i < routes_temporary_not_available_arr->len; i++) {
const NMPObject *o = routes_temporary_not_available_arr->pdata[i]; const NMPObject *o = routes_temporary_not_available_arr->pdata[i];
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
nm_assert(NMP_OBJECT_GET_TYPE(o) == NMP_OBJECT_TYPE_IP_ROUTE(NM_IS_IPv4(addr_family))); nm_assert(NMP_OBJECT_GET_TYPE(o) == NMP_OBJECT_TYPE_IP_ROUTE(NM_IS_IPv4(addr_family)));

4
src/core/nm-test-utils-core.h
View file

@ -211,7 +211,7 @@ nmtst_platform_ip4_routes_equal(const NMPlatformIP4Route *a,
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (nm_platform_ip4_route_cmp_full(&a[i], &b[i]) != 0) { if (nm_platform_ip4_route_cmp_full(&a[i], &b[i]) != 0) {
char buf[sizeof(_nm_utils_to_string_buffer)]; char buf[NM_UTILS_TO_STRING_BUFFER_SIZE];
g_error("Error comparing IPv4 route[%lu]: %s vs %s", g_error("Error comparing IPv4 route[%lu]: %s vs %s",
(unsigned long) i, (unsigned long) i,
@ -280,7 +280,7 @@ nmtst_platform_ip6_routes_equal(const NMPlatformIP6Route *a,
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (nm_platform_ip6_route_cmp_full(&a[i], &b[i]) != 0) { if (nm_platform_ip6_route_cmp_full(&a[i], &b[i]) != 0) {
char buf[sizeof(_nm_utils_to_string_buffer)]; char buf[NM_UTILS_TO_STRING_BUFFER_SIZE];
g_error("Error comparing IPv6 route[%lu]: %s vs %s", g_error("Error comparing IPv6 route[%lu]: %s vs %s",
(unsigned long) i, (unsigned long) i,

2
src/core/platform/tests/test-common.c
View file

@ -239,7 +239,7 @@ _nmtstp_platform_ip_addresses_assert(const char *filename,
} }
} }
if ((IS_IPv4 ? force_exact_4 : force_exact_6) && nm_g_ptr_array_len(plat_addrs) > 0) { if ((IS_IPv4 ? force_exact_4 : force_exact_6) && nm_g_ptr_array_len(plat_addrs) > 0) {
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
NM_PRAGMA_WARNING_DISABLE_DANGLING_POINTER NM_PRAGMA_WARNING_DISABLE_DANGLING_POINTER
g_error("%s:%d: %u IPv%c addresses found on ifindex %d that should not be there (one " g_error("%s:%d: %u IPv%c addresses found on ifindex %d that should not be there (one "

2
src/core/tests/test-l3cfg.c
View file

@ -956,7 +956,7 @@ test_l3_ipv6ll(gconstpointer test_data)
.steps_done = FALSE, .steps_done = FALSE,
}; };
TestL3IPv6LLData *const tdata = &tdata_stack; TestL3IPv6LLData *const tdata = &tdata_stack;
char sbuf1[sizeof(_nm_utils_to_string_buffer)]; char sbuf1[NM_UTILS_TO_STRING_BUFFER_SIZE];
int r; int r;
_LOGD("test start (/l3-ipv6ll/%d)", TEST_IDX); _LOGD("test start (/l3-ipv6ll/%d)", TEST_IDX);

2
src/libnm-glib-aux/nm-shared-utils.c
View file

@ -870,7 +870,7 @@ nm_utils_to_string_buffer_init(char **buf, gsize *len)
{ {
if (!*buf) { if (!*buf) {
*buf = _nm_utils_to_string_buffer; *buf = _nm_utils_to_string_buffer;
*len = sizeof(_nm_utils_to_string_buffer); *len = NM_UTILS_TO_STRING_BUFFER_SIZE;
} }
} }

4
src/libnm-platform/nm-linux-platform.c
View file

@ -6393,8 +6393,8 @@ cache_on_change(NMPlatform *platform,
const NMPObject *obj_new) const NMPObject *obj_new)
{ {
const NMPClass *klass; const NMPClass *klass;
char str_buf[sizeof(_nm_utils_to_string_buffer)]; char str_buf[NM_UTILS_TO_STRING_BUFFER_SIZE];
char str_buf2[sizeof(_nm_utils_to_string_buffer)]; char str_buf2[NM_UTILS_TO_STRING_BUFFER_SIZE];
NMPCache *cache = nm_platform_get_cache(platform); NMPCache *cache = nm_platform_get_cache(platform);
ASSERT_nmp_cache_ops(cache, cache_op, obj_old, obj_new); ASSERT_nmp_cache_ops(cache, cache_op, obj_old, obj_new);

12
src/libnm-platform/nm-platform.c
View file

@ -4033,7 +4033,7 @@ nm_platform_ip_address_sync(NMPlatform *self,
/* Disabled. Enable this for printf debugging. */ /* Disabled. Enable this for printf debugging. */
if (EXTRA_LOGGING) { if (EXTRA_LOGGING) {
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
char sbuf1[50]; char sbuf1[50];
_LOG3T("IPv%c address sync on %d (%u addresses, %u to prune)", _LOG3T("IPv%c address sync on %d (%u addresses, %u to prune)",
@ -4114,7 +4114,7 @@ nm_platform_ip_address_sync(NMPlatform *self,
if (EXTRA_LOGGING && plat_addresses) { if (EXTRA_LOGGING && plat_addresses) {
for (i = 0; i < plat_addresses->len; i++) { for (i = 0; i < plat_addresses->len; i++) {
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
char sbuf1[50]; char sbuf1[50];
_LOG3T(" platform#%u: %s%s", _LOG3T(" platform#%u: %s%s",
@ -4376,7 +4376,7 @@ next_plat:;
NMP_OBJECT_CAST_IPX_ADDRESS(plat_obj), NMP_OBJECT_CAST_IPX_ADDRESS(plat_obj),
NM_PLATFORM_IP_ADDRESS_CMP_TYPE_SEMANTICALLY) NM_PLATFORM_IP_ADDRESS_CMP_TYPE_SEMANTICALLY)
== 0) { == 0) {
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
/* The object is already added. Skip update. */ /* The object is already added. Skip update. */
_LOG3t( _LOG3t(
@ -4726,8 +4726,8 @@ nm_platform_ip_route_sync(NMPlatform *self,
guint i; guint i;
int i_type; int i_type;
gboolean success = TRUE; gboolean success = TRUE;
char sbuf1[sizeof(_nm_utils_to_string_buffer)]; char sbuf1[NM_UTILS_TO_STRING_BUFFER_SIZE];
char sbuf2[sizeof(_nm_utils_to_string_buffer)]; char sbuf2[NM_UTILS_TO_STRING_BUFFER_SIZE];
nm_assert(NM_IS_PLATFORM(self)); nm_assert(NM_IS_PLATFORM(self));
nm_assert(ifindex > 0); nm_assert(ifindex > 0);
@ -5074,7 +5074,7 @@ nm_platform_ip_route_normalize(int addr_family, NMPlatformIPRoute *route)
static int static int
_ip_route_add(NMPlatform *self, NMPNlmFlags flags, int addr_family, gconstpointer route) _ip_route_add(NMPlatform *self, NMPNlmFlags flags, int addr_family, gconstpointer route)
{ {
char sbuf[sizeof(_nm_utils_to_string_buffer)]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
int ifindex; int ifindex;
_CHECK_SELF(self, klass, FALSE); _CHECK_SELF(self, klass, FALSE);

6
src/libnm-platform/nmp-object.c
View file

@ -889,7 +889,7 @@ nmp_object_to_string(const NMPObject *obj,
gsize buf_size) gsize buf_size)
{ {
const NMPClass *klass; const NMPClass *klass;
char buf2[sizeof(_nm_utils_to_string_buffer)]; char buf2[NM_UTILS_TO_STRING_BUFFER_SIZE];
if (!nm_utils_to_string_buffer_init_null(obj, &buf, &buf_size)) if (!nm_utils_to_string_buffer_init_null(obj, &buf, &buf_size))
return buf; return buf;
@ -980,7 +980,7 @@ _vt_cmd_obj_to_string_lnk_vlan(const NMPObject *obj,
gsize buf_size) gsize buf_size)
{ {
const NMPClass *klass; const NMPClass *klass;
char buf2[sizeof(_nm_utils_to_string_buffer)]; char buf2[NM_UTILS_TO_STRING_BUFFER_SIZE];
char *b; char *b;
gsize l; gsize l;
@ -1044,7 +1044,7 @@ _vt_cmd_obj_to_string_lnk_wireguard(const NMPObject *obj,
gsize buf_size) gsize buf_size)
{ {
const NMPClass *klass; const NMPClass *klass;
char buf2[sizeof(_nm_utils_to_string_buffer)]; char buf2[NM_UTILS_TO_STRING_BUFFER_SIZE];
char *b; char *b;
guint i; guint i;