diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-06-22 11:57:25 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-06-22 11:57:25 +0200 |
| commit | d69f057a65a63e7f62a1f2cea789c6367547202b (patch) | |
| tree | 4f41d246d9c340c3cc07f9d0dd617deb38d846a9 | |
| parent | 4aefad567387cf11c460f77beeb9f05bd05e46c0 (diff) | |
| download | NetworkManager-d69f057a65a63e7f62a1f2cea789c6367547202b.tar.gz | |
shared: add nm_strvarray_get_strv_non_empty() helper
| -rw-r--r-- | shared/nm-glib-aux/nm-shared-utils.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h index 67997e6b58..0831f11c3d 100644 --- a/shared/nm-glib-aux/nm-shared-utils.h +++ b/shared/nm-glib-aux/nm-shared-utils.h @@ -2023,6 +2023,18 @@ nm_strvarray_add (GArray *array, const char *str) } static inline const char *const* +nm_strvarray_get_strv_non_empty (GArray *arr, guint *length) +{ + if (!arr || arr->len == 0) { + NM_SET_OUT (length, 0); + return NULL; + } + + NM_SET_OUT (length, arr->len); + return &g_array_index (arr, const char *, 0); +} + +static inline const char *const* nm_strvarray_get_strv (GArray **arr, guint *length) { if (!*arr) { |