sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

Revert "lib/util: Expose strv_addn() for adding string with specified length"

Browse Source 
This reverts commit 0c61dd15137b4603bd47b3d6ae18ded6bd18ffae.

The intention of strv_addn() is to be able to add some number of
characters from an existing string.  This implementation carelessly
assumes that the old _strv_append() added the trailing NUL to form a
valid strv.  That's not true.

New implementation to follow.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Martin Schwenke 2016-02-29 19:49:39 +11:00 committed by Volker Lendecke
parent abd8b18244
commit 049e47b443
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/util/strv.c
View File

@ -22,7 +22,8 @@
#include "talloc.h"
#include <string.h>
int strv_addn(TALLOC_CTX *mem_ctx, char **dst, const char *src, size_t srclen)
static int _strv_append(TALLOC_CTX *mem_ctx, char **dst, const char *src,
size_t srclen)
{
size_t dstlen = talloc_array_length(*dst);
size_t newlen = dstlen + srclen;
@ -44,12 +45,12 @@ int strv_addn(TALLOC_CTX *mem_ctx, char **dst, const char *src, size_t srclen)
int strv_add(TALLOC_CTX *mem_ctx, char **strv, const char *string)
{
return strv_addn(mem_ctx, strv, string, strlen(string)+1);
return _strv_append(mem_ctx, strv, string, strlen(string)+1);
}
int strv_append(TALLOC_CTX *mem_ctx, char **strv, const char *src)
{
return strv_addn(mem_ctx, strv, src, talloc_array_length(src));
return _strv_append(mem_ctx, strv, src, talloc_array_length(src));
}
static bool strv_valid_entry(const char *strv, const char *entry,

1
lib/util/strv.h
View File

@ -23,7 +23,6 @@
#include "talloc.h"
int strv_add(TALLOC_CTX *mem_ctx, char **strv, const char *string);
int strv_addn(TALLOC_CTX *mem_ctx, char **dst, const char *src, size_t srclen);
int strv_append(TALLOC_CTX *mem_ctx, char **strv, const char *src);
char *strv_next(char *strv, const char *entry);
char *strv_find(char *strv, const char *entry);