mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-14 22:28:06 +02:00
aeaba8a2a1
With a static array, we indicate that the argument must not be NULL.
Gcc-14.0.1-0.2.fc40 now warns against that:
CC src/libnm-base/libnm_base_la-nm-base.lo
In file included from ../src/libnm-std-aux/nm-default-std.h:102,
from ../src/libnm-glib-aux/nm-default-glib.h:11,
from ../src/libnm-glib-aux/nm-default-glib-i18n-lib.h:13,
from ../src/libnm-base/nm-base.c:3:
../src/libnm-base/nm-base.c: In function 'nm_net_devname_infiniband':
../src/libnm-std-aux/nm-std-aux.h:191:12: error: 'nonnull' argument 'name' compared to NULL [-Werror=nonnull-compare]
191 | if (expr) \
| ^
../src/libnm-std-aux/nm-std-aux.h:202:27: note: in expansion of macro '_NM_BOOLEAN_EXPR_IMPL'
202 | _NM_BOOLEAN_EXPR_IMPL(NM_UNIQ, expr))
| ^~~~~~~~~~~~~~~~~~~~~
../src/libnm-glib-aux/nm-macros-internal.h:1693:31: note: in expansion of macro 'NM_BOOLEAN_EXPR'
1693 | #define _G_BOOLEAN_EXPR(expr) NM_BOOLEAN_EXPR(expr)
| ^~~~~~~~~~~~~~~
/usr/include/glib-2.0/glib/gmacros.h:1244:43: note: in expansion of macro '_G_BOOLEAN_EXPR'
1244 | #define G_LIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 1))
| ^~~~~~~~~~~~~~~
/usr/include/glib-2.0/glib/gmessages.h:656:9: note: in expansion of macro 'G_LIKELY'
656 | if (G_LIKELY (expr)) \
| ^~~~~~~~
../src/libnm-base/nm-base.c:57:5: note: in expansion of macro 'g_return_val_if_fail'
57 | g_return_val_if_fail(name, NULL);
| ^~~~~~~~~~~~~~~~~~~~
../src/libnm-core-impl/nm-setting-wireguard.c: In function '_nm_wireguard_peer_set_public_key_bin':
../src/libnm-core-impl/nm-setting-wireguard.c:316:8: error: 'nonnull' argument 'public_key' compared to NULL [-Werror=nonnull-compare]
316 | if (!public_key)
| ^
Convert these checks to an nm_assert() to suppress the warning.
(cherry picked from commit 7a031eef5d)
76 lines
2.4 KiB
C
76 lines
2.4 KiB
C
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
|
|
#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
|
|
|
|
#include "nm-base.h"
|
|
|
|
/*****************************************************************************/
|
|
|
|
NM_CACHED_QUARK_FCN("nm-crypto-error-quark", _nm_crypto_error_quark);
|
|
|
|
/*****************************************************************************/
|
|
|
|
char *
|
|
nm_dhcp_iaid_to_hexstr(guint32 iaid, char buf[static NM_DHCP_IAID_TO_HEXSTR_BUF_LEN])
|
|
{
|
|
iaid = htobe32(iaid);
|
|
return nm_utils_bin2hexstr_full(&iaid, sizeof(iaid), ':', FALSE, buf);
|
|
}
|
|
|
|
gboolean
|
|
nm_dhcp_iaid_from_hexstr(const char *str, guint32 *out_value)
|
|
{
|
|
union {
|
|
guint32 num;
|
|
guint8 bin[sizeof(guint32)];
|
|
} iaid;
|
|
|
|
if (!nm_utils_hexstr2bin_full(str,
|
|
TRUE,
|
|
FALSE,
|
|
FALSE,
|
|
":",
|
|
sizeof(iaid),
|
|
iaid.bin,
|
|
sizeof(iaid),
|
|
NULL))
|
|
return FALSE;
|
|
|
|
NM_SET_OUT(out_value, be32toh(iaid.num));
|
|
return TRUE;
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
|
|
/* nm_net_devname_infiniband:
|
|
* @name: the output-buffer where the value will be written. Must be
|
|
* not %NULL and point to a string buffer of at least IFNAMSIZ bytes.
|
|
* @parent_name: the parent interface name
|
|
* @p_key: the partition key.
|
|
*
|
|
* Returns: the infiniband name will be written to @name and @name
|
|
* is returned.
|
|
*/
|
|
const char *
|
|
nm_net_devname_infiniband(char name[static NM_IFNAMSIZ], const char *parent_name, int p_key)
|
|
{
|
|
nm_assert(name);
|
|
|
|
g_return_val_if_fail(parent_name && parent_name[0], NULL);
|
|
g_return_val_if_fail(strlen(parent_name) < NM_IFNAMSIZ, NULL);
|
|
|
|
/* technically, p_key of 0x0000 and 0x8000 is not allowed either. But we don't
|
|
* want to assert against that in nm_net_devname_infiniband(). So be more
|
|
* resilient here, and accept those. */
|
|
g_return_val_if_fail(p_key >= 0 && p_key <= 0xffff, NULL);
|
|
|
|
nm_assert(nm_utils_ifname_valid_kernel(parent_name, NULL));
|
|
|
|
/* If parent+suffix is too long, kernel would just truncate
|
|
* the name. We do the same. See ipoib_vlan_add(). */
|
|
g_snprintf(name, NM_IFNAMSIZ, "%s.%04x", parent_name, p_key);
|
|
|
|
nm_assert(nm_utils_ifname_valid_kernel(name, NULL));
|
|
|
|
return name;
|
|
}
|