External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: buffer: Don't treat missing truncation in virBufferTrim as usage error

Browse Source 
Usage errors in the virBuffer are hard to track anyways. Just trim
noting if the user requests the trimming string to be used without
providing it.

The change in the test proves that it's a no-op now.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-10-24 09:05:49 +02:00
parent 65d748fac6
commit 49037f94d2
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/virbuffer.c
View File

@ -784,8 +784,6 @@ virBufferStrcat(virBufferPtr buf, ...)
* if the current tail of the buffer matches @str; a non-negative @len
* further limits how much of the tail is trimmed. If @str is NULL, then
* @len must be non-negative.
*
* Sets error to -1 (usage) if str is NULL and len is less than zero.
*/
void
virBufferTrim(virBufferPtr buf, const char *str, int len)
@ -794,10 +792,8 @@ virBufferTrim(virBufferPtr buf, const char *str, int len)
if (!buf || buf->error)
return;
if (!str && len < 0) {
virBufferSetError(buf, -1);
if (!str && len < 0)
return;
}
if (len > 0 && len > buf->use)
return;

7
tests/virbuftest.c
View File

@ -163,6 +163,7 @@ static int testBufTrim(const void *data G_GNUC_UNUSED)
virBufferTrim(buf, "a", 2);
virBufferAddLit(buf, ",b,,");
virBufferTrim(buf, NULL, -1);
virBufferTrim(buf, "b", -1);
virBufferTrim(buf, "b,,", 1);
virBufferTrim(buf, ",", -1);
@ -178,12 +179,6 @@ static int testBufTrim(const void *data G_GNUC_UNUSED)
goto cleanup;
}
virBufferTrim(buf, NULL, -1);
if (virBufferError(buf) != -1) {
VIR_TEST_DEBUG("Usage error not flagged");
goto cleanup;
}
ret = 0;
cleanup: