diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-02-07 02:57:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:44:45 -0500 |
| commit | e5b00e3637b82bc72382e1a5cd75a521c7598743 (patch) | |
| tree | 94169bdd75b8a326548d445f5252848c74681160 /source4/torture/local/iconv.c | |
| parent | b115da2230944aa13ea777ccc65bf978e257e4cb (diff) | |
| download | samba-e5b00e3637b82bc72382e1a5cd75a521c7598743.tar.gz samba-e5b00e3637b82bc72382e1a5cd75a521c7598743.tar.bz2 samba-e5b00e3637b82bc72382e1a5cd75a521c7598743.zip | |
r21211: fixed 3 places that assumed that torture_fail() didn't call
return. Having a lowercase macro that returns from a function is
probably a bad idea - it looks too much like a C function but doesn't
behave like one.
(This used to be commit e680656419f00fd8b4ddb996fd247bada0f0a51d)
Diffstat (limited to 'source4/torture/local/iconv.c')
| -rw-r--r-- | source4/torture/local/iconv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c index 45c01221d7..87056d1b95 100644 --- a/source4/torture/local/iconv.c +++ b/source4/torture/local/iconv.c @@ -135,8 +135,6 @@ static bool test_buffer(struct torture_context *test, talloc_asprintf(test, "failed to open %s to UTF-16LE", charset)); - cd = NULL; - return false; } cd2 = smb_iconv_open(charset, "UTF-16LE"); cd3 = smb_iconv_open("UTF-16LE", charset); @@ -246,11 +244,11 @@ static bool test_buffer(struct torture_context *test, torture_comment(test, "pull bytes mismatch:"); show_buf("inbuf", inbuf, size); show_buf(" buf3", buf3, sizeof(buf3) - outsize3); - torture_fail(test, ""); torture_comment(test, "next codepoint is %u\n", get_codepoint((char *)(inbuf+sizeof(buf3) - outsize3), size - (sizeof(buf3) - outsize3), "UTF-16LE")); + torture_fail(test, ""); } return true; |