diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-10-26 16:47:13 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-10-27 17:04:19 +0100 |
| commit | 931573dfda5d009b20800d6155a5b2b53fc8bb75 (patch) | |
| tree | ed43c9cb842ddbe0c855e93bd9d033524943a8f1 | |
| parent | 1cda792206ae4ea72fd3ecd891f665933565adc7 (diff) | |
| download | NetworkManager-931573dfda5d009b20800d6155a5b2b53fc8bb75.tar.gz | |
shared: rename nm_add_u32_clamped() to nm_add_clamped_u32()
| -rw-r--r-- | shared/nm-std-aux/nm-std-aux.h | 4 | ||||
| -rw-r--r-- | src/nm-l3-config-data.c | 2 | ||||
| -rw-r--r-- | src/platform/nm-platform.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/shared/nm-std-aux/nm-std-aux.h b/shared/nm-std-aux/nm-std-aux.h index 44d0dd273b..a10abfb6a6 100644 --- a/shared/nm-std-aux/nm-std-aux.h +++ b/shared/nm-std-aux/nm-std-aux.h @@ -190,11 +190,11 @@ typedef uint64_t _nm_bitwise nm_be64_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; - /* 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; if (c < a) diff --git a/src/nm-l3-config-data.c b/src/nm-l3-config-data.c index 9b1e017b14..3f6db67c61 100644 --- a/src/nm-l3-config-data.c +++ b/src/nm-l3-config-data.c @@ -2600,7 +2600,7 @@ nm_l3_config_data_merge(NML3ConfigData * self, if (r_src->metric_any) { _ensure_r(); 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)) { diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index df637fe03e..53bb7777c2 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -2086,7 +2086,7 @@ nm_platform_ip4_route_get_effective_metric(const NMPlatformIP4Route *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; } @@ -2095,7 +2095,7 @@ nm_platform_ip6_route_get_effective_metric(const NMPlatformIP6Route *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; } |