External/libvirt
1
0
Fork 0
Code

virbuftest: remove unnecessary labels

Browse Source 
Remove the ret variables and labels from functions that no longer need
them.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Ján Tomko 2020-01-14 08:10:25 +01:00
parent b0138d55f7
commit 662876723c
1 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tests/virbuftest.c
View File

@ -246,7 +246,6 @@ testBufAddStr(const void *opaque)
const struct testBufAddStrData *data = opaque; const struct testBufAddStrData *data = opaque;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
g_autofree char *actual = NULL; g_autofree char *actual = NULL;
int ret = -1;
virBufferAddLit(&buf, "<c>\n"); virBufferAddLit(&buf, "<c>\n");
virBufferAdjustIndent(&buf, 2); virBufferAdjustIndent(&buf, 2);
@ -256,19 +255,16 @@ testBufAddStr(const void *opaque)
if (!(actual = virBufferContentAndReset(&buf))) { if (!(actual = virBufferContentAndReset(&buf))) {
VIR_TEST_DEBUG("buf is empty"); VIR_TEST_DEBUG("buf is empty");
goto cleanup; return -1;
} }
if (STRNEQ_NULLABLE(actual, data->expect)) { if (STRNEQ_NULLABLE(actual, data->expect)) {
VIR_TEST_DEBUG("testBufAddStr(): Strings don't match:"); VIR_TEST_DEBUG("testBufAddStr(): Strings don't match:");
virTestDifference(stderr, data->expect, actual); virTestDifference(stderr, data->expect, actual);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
@ -278,7 +274,6 @@ testBufEscapeStr(const void *opaque)
const struct testBufAddStrData *data = opaque; const struct testBufAddStrData *data = opaque;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
g_autofree char *actual = NULL; g_autofree char *actual = NULL;
int ret = -1;
virBufferAddLit(&buf, "<c>\n"); virBufferAddLit(&buf, "<c>\n");
virBufferAdjustIndent(&buf, 2); virBufferAdjustIndent(&buf, 2);
@ -288,19 +283,16 @@ testBufEscapeStr(const void *opaque)
if (!(actual = virBufferContentAndReset(&buf))) { if (!(actual = virBufferContentAndReset(&buf))) {
VIR_TEST_DEBUG("buf is empty"); VIR_TEST_DEBUG("buf is empty");
goto cleanup; return -1;
} }
if (STRNEQ_NULLABLE(actual, data->expect)) { if (STRNEQ_NULLABLE(actual, data->expect)) {
VIR_TEST_DEBUG("testBufEscapeStr(): Strings don't match:"); VIR_TEST_DEBUG("testBufEscapeStr(): Strings don't match:");
virTestDifference(stderr, data->expect, actual); virTestDifference(stderr, data->expect, actual);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
@ -310,25 +302,21 @@ testBufEscapeRegex(const void *opaque)
const struct testBufAddStrData *data = opaque; const struct testBufAddStrData *data = opaque;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
g_autofree char *actual = NULL; g_autofree char *actual = NULL;
int ret = -1;
virBufferEscapeRegex(&buf, "%s", data->data); virBufferEscapeRegex(&buf, "%s", data->data);
if (!(actual = virBufferContentAndReset(&buf))) { if (!(actual = virBufferContentAndReset(&buf))) {
VIR_TEST_DEBUG("testBufEscapeRegex: buf is empty"); VIR_TEST_DEBUG("testBufEscapeRegex: buf is empty");
goto cleanup; return -1;
} }
if (STRNEQ_NULLABLE(actual, data->expect)) { if (STRNEQ_NULLABLE(actual, data->expect)) {
VIR_TEST_DEBUG("testBufEscapeRegex: Strings don't match:"); VIR_TEST_DEBUG("testBufEscapeRegex: Strings don't match:");
virTestDifference(stderr, data->expect, actual); virTestDifference(stderr, data->expect, actual);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
@ -337,7 +325,6 @@ testBufSetIndent(const void *opaque G_GNUC_UNUSED)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
g_autofree char *actual = NULL; g_autofree char *actual = NULL;
int ret = -1;
virBufferSetIndent(&buf, 11); virBufferSetIndent(&buf, 11);
virBufferAddLit(&buf, "test\n"); virBufferAddLit(&buf, "test\n");
@ -345,17 +332,14 @@ testBufSetIndent(const void *opaque G_GNUC_UNUSED)
virBufferAddLit(&buf, "test2\n"); virBufferAddLit(&buf, "test2\n");
if (!(actual = virBufferContentAndReset(&buf))) if (!(actual = virBufferContentAndReset(&buf)))
goto cleanup; return -1;
if (STRNEQ(actual, " test\n test2\n")) { if (STRNEQ(actual, " test\n test2\n")) {
VIR_TEST_DEBUG("testBufSetIndent: expected indent not set"); VIR_TEST_DEBUG("testBufSetIndent: expected indent not set");
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }