From cd00b040995ba78a983e77f1941bbe0cf02397ea Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 18 Mar 2021 11:29:45 +0100 Subject: [PATCH] libnm: expose NM_IW_ESSID_MAX_SIZE define --- src/libnm-base/nm-base.h | 4 ++++ src/libnm-core-impl/nm-utils.c | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libnm-base/nm-base.h b/src/libnm-base/nm-base.h index 138e8b04b2..3f0ca02544 100644 --- a/src/libnm-base/nm-base.h +++ b/src/libnm-base/nm-base.h @@ -366,4 +366,8 @@ typedef struct { /****************************************************************************/ +#define NM_IW_ESSID_MAX_SIZE 32 + +/****************************************************************************/ + #endif /* __NM_LIBNM_BASE_H__ */ diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c index 202f160ead..badae39a1b 100644 --- a/src/libnm-core-impl/nm-utils.c +++ b/src/libnm-core-impl/nm-utils.c @@ -633,8 +633,6 @@ nm_utils_is_empty_ssid(const guint8 *ssid, gsize len) return _nm_utils_is_empty_ssid_arr(ssid, len); } -#define ESSID_MAX_SIZE 32 - /** * nm_utils_escape_ssid: * @ssid: (array length=len): pointer to a buffer containing the SSID data @@ -651,7 +649,7 @@ nm_utils_is_empty_ssid(const guint8 *ssid, gsize len) const char * nm_utils_escape_ssid(const guint8 *ssid, gsize len) { - static char escaped[ESSID_MAX_SIZE * 2 + 1]; + static char escaped[NM_IW_ESSID_MAX_SIZE * 2 + 1]; const guint8 *s = ssid; char * d = escaped; @@ -660,7 +658,7 @@ nm_utils_escape_ssid(const guint8 *ssid, gsize len) return escaped; } - len = MIN(len, (guint32) ESSID_MAX_SIZE); + len = MIN(len, (guint32) NM_IW_ESSID_MAX_SIZE); while (len--) { if (*s == '\0') { *d++ = '\\';