External/libvirt
1
0
Fork 0
Code

util: virstring: Remove unused 'virStringListMerge'

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-09-20 13:09:10 +02:00
parent 6c49c2ee9f
commit 9d34136a52
3 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libvirt_private.syms
View File

@ -3298,7 +3298,6 @@ virStringHasControlChars;
virStringHasSuffix; virStringHasSuffix;
virStringIsEmpty; virStringIsEmpty;
virStringIsPrintable; virStringIsPrintable;
virStringListMerge;
virStringMatch; virStringMatch;
virStringMatchesNameSuffix; virStringMatchesNameSuffix;
virStringParsePort; virStringParsePort;

35
src/util/virstring.c
View File

@ -35,41 +35,6 @@
VIR_LOG_INIT("util.string"); VIR_LOG_INIT("util.string");
/**
* virStringListMerge:
* @dst: a NULL-terminated array of strings to expand
* @src: a NULL-terminated array of strings
*
* Merges @src into @dst. Upon successful return from this
* function, @dst is resized to $(dst + src) elements and @src is
* freed.
*
* Returns 0 on success, -1 otherwise.
*/
int
virStringListMerge(char ***dst,
char ***src)
{
size_t dst_len, src_len, i;
if (!src || !*src)
return 0;
dst_len = g_strv_length(*dst);
src_len = g_strv_length(*src);
VIR_REALLOC_N(*dst, dst_len + src_len + 1);
for (i = 0; i <= src_len; i++)
(*dst)[i + dst_len] = (*src)[i];
/* Don't call g_strfreev() as it would free strings in
* @src. */
VIR_FREE(*src);
return 0;
}
/* Like strtol, but produce an "int" result, and check more carefully. /* Like strtol, but produce an "int" result, and check more carefully.
Return 0 upon success; return -1 to indicate failure. Return 0 upon success; return -1 to indicate failure.
When END_PTR is NULL, the byte after the final valid digit must be NUL. When END_PTR is NULL, the byte after the final valid digit must be NUL.

3
src/util/virstring.h
View File

@ -22,9 +22,6 @@
#define VIR_INT64_STR_BUFLEN 21 #define VIR_INT64_STR_BUFLEN 21
int virStringListMerge(char ***dst,
char ***src);
int virStrToLong_i(char const *s, int virStrToLong_i(char const *s,
char **end_ptr, char **end_ptr,
int base, int base,