8fc58f61c3
Resolves: rhbz#1593240, rhbz#1608212, rhbz#1547014, rhbz#1547014,
rhbz#1649868, rhbz#1588596, rhbz#1642546, rhbz#1595911,
rhbz#1644311, rhbz#1337489, rhbz#1630187, rhbz#1622583
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From e1b45e66bc185f5db4c252e1f3fb1b4400b4538e Mon Sep 17 00:00:00 2001
|
|
From: Sumit Bose <sbose@redhat.com>
|
|
Date: Fri, 22 Mar 2019 10:36:38 +0100
|
|
Subject: [PATCH 2/4] library: make _adcli_strv_has_ex public
|
|
|
|
Related to https://bugzilla.redhat.com/show_bug.cgi?id=1630187
|
|
---
|
|
library/adprivate.h | 4 ++++
|
|
library/adutil.c | 2 +-
|
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/library/adprivate.h b/library/adprivate.h
|
|
index 0806430..55e6234 100644
|
|
--- a/library/adprivate.h
|
|
+++ b/library/adprivate.h
|
|
@@ -125,6 +125,10 @@ void _adcli_strv_free (char **strv);
|
|
int _adcli_strv_has (char **strv,
|
|
const char *str);
|
|
|
|
+int _adcli_strv_has_ex (char **strv,
|
|
+ const char *str,
|
|
+ int (* compare) (const char *match, const char*value));
|
|
+
|
|
char ** _adcli_strv_dup (char **strv) GNUC_WARN_UNUSED;
|
|
|
|
char * _adcli_strv_join (char **strv,
|
|
diff --git a/library/adutil.c b/library/adutil.c
|
|
index 76ea158..9b0c47f 100644
|
|
--- a/library/adutil.c
|
|
+++ b/library/adutil.c
|
|
@@ -221,7 +221,7 @@ _adcli_strv_add (char **strv,
|
|
return seq_push (strv, length, string);
|
|
}
|
|
|
|
-static int
|
|
+int
|
|
_adcli_strv_has_ex (char **strv,
|
|
const char *str,
|
|
int (* compare) (const char *match, const char*value))
|
|
--
|
|
2.20.1
|
|
|