diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-08-25 15:27:30 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-09-11 14:32:05 +0200 |
| commit | b92193236ae989aca3baf1208f0684d7b432218e (patch) | |
| tree | caeacb767ff0a2b25d7ac9c614bd0df5039c25cf /libnm-core | |
| parent | 0eb4a5dfa7afeba706649a2b6f6cd579fc30a683 (diff) | |
| download | NetworkManager-b92193236ae989aca3baf1208f0684d7b432218e.tar.gz | |
setting-gsm: use size_t variable for strlen() result
Diffstat (limited to 'libnm-core')
| -rw-r--r-- | libnm-core/nm-setting-gsm.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libnm-core/nm-setting-gsm.c b/libnm-core/nm-setting-gsm.c index 973120af86..cb482095e5 100644 --- a/libnm-core/nm-setting-gsm.c +++ b/libnm-core/nm-setting-gsm.c @@ -292,8 +292,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } if (priv->apn) { - guint32 apn_len = strlen (priv->apn); - guint32 i; + gsize apn_len = strlen (priv->apn); + gsize i; if (apn_len < 1 || apn_len > 64) { g_set_error (error, @@ -339,7 +339,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } } - if (priv->username && !strlen (priv->username)) { + if ( priv->username + && priv->username[0] == '\0') { g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -349,8 +350,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } if (priv->network_id) { - guint32 nid_len = strlen (priv->network_id); - guint32 i; + gsize nid_len = strlen (priv->network_id); + gsize i; /* Accept both 5 and 6 digit MCC/MNC codes */ if ((nid_len < 5) || (nid_len > 6)) { |