Skip to content

Commit 4babe68

Browse files
committed
libpromises now provides RlistToStringSeq()
Copies the strings of an `Rlist` into a `Seq`. Replaces private copies of the same helper in enterprise and nova. Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
1 parent fa0a1a9 commit 4babe68

2 files changed

Lines changed: 22 additions & 0 deletions

File tree

‎libpromises/rlist.c‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
#include <eval_context.h>
3838
#include <json.h>
3939
#include <vars.h> /* IsCf3VarString */
40+
#include <sequence.h>
41+
#include <alloc.h>
4042

4143

4244
static Rlist *RlistPrependRval(Rlist **start, Rval rval);
@@ -1776,3 +1778,15 @@ Rlist *RlistFromContainer(const JsonElement *container)
17761778

17771779
return list;
17781780
}
1781+
1782+
Seq *RlistToStringSeq(const Rlist *list)
1783+
{
1784+
Seq *seq = SeqNew(RlistLen(list), free);
1785+
1786+
for (const Rlist *rp = list; rp != NULL; rp = rp->next)
1787+
{
1788+
SeqAppend(seq, xstrdup(RlistScalarValue(rp)));
1789+
}
1790+
1791+
return seq;
1792+
}

‎libpromises/rlist.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include <writer.h>
3030
#include <json.h>
3131
#include <fncall.h>
32+
#include <sequence.h>
3233

3334
/* NOTE: an empty Rlist is simply NULL. */
3435
struct Rlist_
@@ -107,6 +108,13 @@ Rlist *RlistFromSplitRegex(const char *string, const char *regex, size_t max_ent
107108
Rlist *RlistFromRegexSplitNoOverflow(const char *string, const char *regex, int max);
108109
Rlist *RlistFromContainer(const JsonElement *container);
109110

111+
/**
112+
* @brief Copy the scalar strings of a list into a sequence
113+
* @param list List of scalar strings (NULL is the empty list)
114+
* @return Sequence of copied strings. Destroy with SeqDestroy().
115+
*/
116+
Seq *RlistToStringSeq(const Rlist *list);
117+
110118
void RlistWrite(Writer *writer, const Rlist *list);
111119
Rlist *RlistLast(Rlist *start);
112120
void RlistFilter(Rlist **list, bool (*KeepPredicate)(void *item, void *predicate_data), void *predicate_user_data, void (*DestroyItem)(void *item));

0 commit comments

Comments
 (0)