[libvirt] [PATCH] virstring: Unify string list function names
Andrea Bolognani
abologna at redhat.com
Fri Nov 25 11:08:41 UTC 2016
On Fri, 2016-11-25 at 09:28 +0100, Michal Privoznik wrote:
> We have couple of functions that operate over NULL terminated
> lits of strings. However, our naming sucks:
>
> virStringJoin
> virStringFreeList
> virStringFreeListCount
> virStringArrayHasString
> virStringGetFirstWithPrefix
>
> We can do better:
>
> virStringListJoin
> virStringListFree
> virStringListFreeCount
> virStringListHasString
> virStringListGetFirstWithPrefix
>
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
[...]
> @@ -227,7 +227,7 @@ virStringArrayHasString(const char **strings,
> }
>
> char *
> -virStringGetFirstWithPrefix(char **strings, const char *prefix)
> +virStringListGetFirstWithPrefix(char **strings, const char *prefix)
Since you're changing the definition anyway, you can use
the chance to move the second argument to a separate line.
[...]
> @@ -37,15 +37,15 @@ char **virStringSplit(const char *string,
> size_t max_tokens)
> ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
>
> -char *virStringJoin(const char **strings,
> - const char *delim)
> +char *virStringListJoin(const char **strings,
> + const char *delim)
> ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
>
> -void virStringFreeList(char **strings);
> -void virStringFreeListCount(char **strings, size_t count);
> +void virStringListFree(char **strings);
> +void virStringListFreeCount(char **strings, size_t count);
>
> -bool virStringArrayHasString(const char **strings, const char *needle);
> -char *virStringGetFirstWithPrefix(char **strings, const char *prefix)
> +bool virStringListHasString(const char **strings, const char *needle);
> +char *virStringListGetFirstWithPrefix(char **strings, const char *prefix)
> ATTRIBUTE_NONNULL(2);
Same here.
I'm assuming you changed the callers in an automated fashion,
the diff looks sane from a very quick look and the code still
compiles and passes all checks.
ACK
--
Andrea Bolognani / Red Hat / Virtualization
More information about the libvir-list
mailing list