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

shared: rename nm_add_u32_clamped() to nm_add_clamped_u32()

Browse source
This commit is contained in:
Thomas Haller 2020-10-26 16:47:13 +01:00
parent 1cda792206
commit 931573dfda
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shared/nm-std-aux/nm-std-aux.h
View file

@ -190,11 +190,11 @@ typedef uint64_t _nm_bitwise nm_be64_t;
/*****************************************************************************/ /*****************************************************************************/
static inline uint32_t static inline uint32_t
nm_add_u32_clamped(uint32_t a, uint32_t b) nm_add_clamped_u32(uint32_t a, uint32_t b)
{ {
uint32_t c; uint32_t c;
/* returns the sum of a+b, or UINT32_MAX if the result would overflow. */ /* returns a+b, or UINT32_MAX if the result would overflow. */
c = a + b; c = a + b;
if (c < a) if (c < a)

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

@ -2600,7 +2600,7 @@ nm_l3_config_data_merge(NML3ConfigData * self,
if (r_src->metric_any) { if (r_src->metric_any) {
_ensure_r(); _ensure_r();
r.rx.metric_any = FALSE; r.rx.metric_any = FALSE;
r.rx.metric = nm_add_u32_clamped(r.rx.metric, default_route_metric_x[IS_IPv4]); r.rx.metric = nm_add_clamped_u32(r.rx.metric, default_route_metric_x[IS_IPv4]);
} }
if (NM_PLATFORM_IP_ROUTE_IS_DEFAULT(r_src)) { if (NM_PLATFORM_IP_ROUTE_IS_DEFAULT(r_src)) {

4
src/platform/nm-platform.h
View file

@ -2086,7 +2086,7 @@ nm_platform_ip4_route_get_effective_metric(const NMPlatformIP4Route *r)
{ {
nm_assert(r); nm_assert(r);
return r->metric_any ? nm_add_u32_clamped(NM_PLATFORM_ROUTE_METRIC_DEFAULT_IP4, r->metric) return r->metric_any ? nm_add_clamped_u32(NM_PLATFORM_ROUTE_METRIC_DEFAULT_IP4, r->metric)
: r->metric; : r->metric;
} }
@ -2095,7 +2095,7 @@ nm_platform_ip6_route_get_effective_metric(const NMPlatformIP6Route *r)
{ {
nm_assert(r); nm_assert(r);
return r->metric_any ? nm_add_u32_clamped(NM_PLATFORM_ROUTE_METRIC_DEFAULT_IP6, r->metric) return r->metric_any ? nm_add_clamped_u32(NM_PLATFORM_ROUTE_METRIC_DEFAULT_IP6, r->metric)
: r->metric; : r->metric;
} }