From ca4401e32781e34c235523dd6dce0d68682b29b9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 30 Oct 2023 08:23:56 +0100 Subject: [PATCH] all: use NM_MAX() instead of NM_CONST_MAX() NM_CONST_MAX() is going to be replaced by NM_MAX() (or, in cases where NM_MAX() cannot be used, by NM_MAX_CONST()). Replace usage. --- src/libnm-core-impl/nm-team-utils.c | 6 +++--- src/libnm-glib-aux/nm-test-utils.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libnm-core-impl/nm-team-utils.c b/src/libnm-core-impl/nm-team-utils.c index 1aae11e49d..6f2f5dd298 100644 --- a/src/libnm-core-impl/nm-team-utils.c +++ b/src/libnm-core-impl/nm-team-utils.c @@ -2812,9 +2812,9 @@ nm_team_setting_new(gboolean is_port, const char *js_str) gsize l; G_STATIC_ASSERT_EXPR(sizeof(*self) == sizeof(self->_data_priv)); - G_STATIC_ASSERT_EXPR(sizeof(*self) - == NM_CONST_MAX(nm_offsetofend(NMTeamSetting, d.master), - nm_offsetofend(NMTeamSetting, d.port))); + G_STATIC_ASSERT_EXPR( + sizeof(*self) + == NM_MAX(nm_offsetofend(NMTeamSetting, d.master), nm_offsetofend(NMTeamSetting, d.port))); l = is_port ? nm_offsetofend(NMTeamSetting, d.port) : nm_offsetofend(NMTeamSetting, d.master); diff --git a/src/libnm-glib-aux/nm-test-utils.h b/src/libnm-glib-aux/nm-test-utils.h index de6fd0f1b0..627151fa21 100644 --- a/src/libnm-glib-aux/nm-test-utils.h +++ b/src/libnm-glib-aux/nm-test-utils.h @@ -1803,7 +1803,7 @@ nmtst_inet_from_string(int addr_family, const char *str) static inline const char * nmtst_inet_to_string(int addr_family, gconstpointer addr) { - static _nm_thread_local char buf[NM_CONST_MAX(INET6_ADDRSTRLEN, INET_ADDRSTRLEN)]; + static _nm_thread_local char buf[NM_MAX(INET6_ADDRSTRLEN, INET_ADDRSTRLEN)]; g_assert(NM_IN_SET(addr_family, AF_INET, AF_INET6)); g_assert(addr);