sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

r21211: fixed 3 places that assumed that torture_fail() didn't call

Browse Source 
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 commit is contained in:
Andrew Tridgell 2007-02-07 02:57:44 +00:00 committed by Gerald (Jerry) Carter
parent 8134a628f0
commit e680656419
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/torture/local/dbspeed.c
View File

@ -63,8 +63,9 @@ static BOOL test_tdb_speed(struct torture_context *torture, const void *_data)
tdbw = tdb_wrap_open(tmp_ctx, "test.tdb",
10000, 0, O_RDWR|O_CREAT|O_TRUNC, 0600);
if (!tdbw) {
unlink("test.tdb");
talloc_free(tmp_ctx);
torture_fail(torture, "Failed to open test.tdb");
goto failed;
}
torture_comment(torture, "Adding %d SID records\n", torture_entries);
@ -171,8 +172,9 @@ static BOOL test_ldb_speed(struct torture_context *torture, const void *_data)
ldb = ldb_wrap_connect(tmp_ctx, "tdb://test.ldb",
NULL, NULL, LDB_FLG_NOSYNC, NULL);
if (!ldb) {
unlink("./test.ldb");
talloc_free(tmp_ctx);
torture_fail(torture, "Failed to open test.ldb");
goto failed;
}
/* add an index */
@ -220,8 +222,9 @@ static BOOL test_ldb_speed(struct torture_context *torture, const void *_data)
}
if (talloc_total_blocks(torture) > 100) {
unlink("./test.ldb");
talloc_free(tmp_ctx);
torture_fail(torture, "memory leak in ldb search");
goto failed;
}
torture_comment(torture, "ldb speed %.2f ops/sec\n", count/timeval_elapsed(&tv));

3
source/torture/local/event.c
View File

@ -99,9 +99,8 @@ static bool test_event_context(struct torture_context *test,
t = timeval_current();
while (!finished) {
if (event_loop_once(ev_ctx) == -1) {
torture_fail(test, "Failed event loop\n");
talloc_free(ev_ctx);
return False;
torture_fail(test, "Failed event loop\n");
}
}

4
source/torture/local/iconv.c
View File

@ -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;