diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-12-27 14:37:21 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-01-09 16:46:41 +0100 |
| commit | fce3243f12e3dd1714f6c207dd37967936bf5485 (patch) | |
| tree | 8d6b114712ce9107d0d36bc2b26d1f6bf70e5338 | |
| parent | af67b4520f58c0afef0f951bebd17f5b928753aa (diff) | |
| download | NetworkManager-fce3243f12e3dd1714f6c207dd37967936bf5485.tar.gz | |
shared/trivial: rename nm_utils_mem_all_zero() to nm_utils_memeqzero()
in systemd/systemd, systemd/casync, and rustyrussel/ccan (github) this
function is called "memeqzero()". Rename, to use a more popular name.
| -rw-r--r-- | shared/nm-utils/nm-shared-utils.c | 2 | ||||
| -rw-r--r-- | shared/nm-utils/nm-shared-utils.h | 2 | ||||
| -rw-r--r-- | src/platform/nm-platform.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/shared/nm-utils/nm-shared-utils.c b/shared/nm-utils/nm-shared-utils.c index bdd0b077fe..93b476d645 100644 --- a/shared/nm-utils/nm-shared-utils.c +++ b/shared/nm-utils/nm-shared-utils.c @@ -2319,7 +2319,7 @@ nm_utils_getpagesize (void) } gboolean -nm_utils_mem_all_zero (gconstpointer data, gsize length) +nm_utils_memeqzero (gconstpointer data, gsize length) { const unsigned char *p = data; int len; diff --git a/shared/nm-utils/nm-shared-utils.h b/shared/nm-utils/nm-shared-utils.h index de57418979..76049804f4 100644 --- a/shared/nm-utils/nm-shared-utils.h +++ b/shared/nm-utils/nm-shared-utils.h @@ -219,7 +219,7 @@ nm_ip_addr_set (int addr_family, gpointer dst, gconstpointer src) /*****************************************************************************/ -gboolean nm_utils_mem_all_zero (gconstpointer data, gsize length); +gboolean nm_utils_memeqzero (gconstpointer data, gsize length); /*****************************************************************************/ diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index af5548ecdc..f64015c70e 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -5577,7 +5577,7 @@ nm_platform_wireguard_peer_to_string (const NMPWireGuardPeer *peer, char *buf, g " tx %"G_GUINT64_FORMAT "%s", /* allowed-ips */ public_key_b64, - nm_utils_mem_all_zero (peer->preshared_key, sizeof (peer->preshared_key)) + nm_utils_memeqzero (peer->preshared_key, sizeof (peer->preshared_key)) ? "" : " preshared-key (hidden)", s_endpoint, @@ -5607,7 +5607,7 @@ nm_platform_lnk_wireguard_to_string (const NMPlatformLnkWireGuard *lnk, char *bu if (!nm_utils_to_string_buffer_init_null (lnk, &buf, &len)) return buf; - if (!nm_utils_mem_all_zero (lnk->public_key, sizeof (lnk->public_key))) + if (!nm_utils_memeqzero (lnk->public_key, sizeof (lnk->public_key))) public_b64 = g_base64_encode (lnk->public_key, sizeof (lnk->public_key)); g_snprintf (buf, len, @@ -5620,7 +5620,7 @@ nm_platform_lnk_wireguard_to_string (const NMPlatformLnkWireGuard *lnk, char *bu ? " public-key " : "", public_b64 ?: "", - nm_utils_mem_all_zero (lnk->private_key, sizeof (lnk->private_key)) + nm_utils_memeqzero (lnk->private_key, sizeof (lnk->private_key)) ? "" : " private-key (hidden)", lnk->listen_port, |