From 092ab227d55d2facd690a4307c4cb5880390b21b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 22 Jun 2020 11:57:25 +0200 Subject: [PATCH] shared: add nm_strvarray_get_strv_non_empty() helper (cherry picked from commit d69f057a65a63e7f62a1f2cea789c6367547202b) --- shared/nm-glib-aux/nm-shared-utils.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h index eeb8be5b7d..16fbb04dcb 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) g_array_append_val (array, s); } +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) {