sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

r25628: Fix formatting, missing include.

Browse Source 
(This used to be commit aafd3ea03f52b08b6697f3778728659c790d03b4)
This commit is contained in:
Jelmer Vernooij 2007-10-14 13:28:01 +02:00 committed by Stefan Metzmacher
parent ef13073676
commit a449b30ca4
2 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/lib/util/util.h
View File

@ -23,6 +23,9 @@
#include "charset/charset.h"
/* for TALLOC_CTX */
#include <talloc.h>
/**
* @file
* @brief Helpful macros
@ -207,7 +210,6 @@ in the root domain, which can cause dial-on-demand links to come up for no
apparent reason.
****************************************************************************/
_PUBLIC_ struct hostent *sys_gethostbyname(const char *name);
_PUBLIC_ const char *sys_inet_ntoa(struct in_addr in);
_PUBLIC_ struct in_addr sys_inet_makeaddr(int net, int host);
/* The following definitions come from lib/util/genrand.c */

16
source4/torture/ui.c
View File

@ -34,7 +34,8 @@ _PUBLIC_ NTSTATUS torture_temp_dir(struct torture_context *tctx,
{
SMB_ASSERT(tctx->outputdir != NULL);
*tempdir = talloc_asprintf(tctx, "%s/%s.XXXXXX", tctx->outputdir, prefix);
*tempdir = talloc_asprintf(tctx, "%s/%s.XXXXXX", tctx->outputdir,
prefix);
NT_STATUS_HAVE_NO_MEMORY(*tempdir);
if (mkdtemp(*tempdir) == NULL) {
@ -127,9 +128,7 @@ static bool wrap_test_with_testcase(struct torture_context *torture_ctx,
struct torture_test *torture_tcase_add_test(struct torture_tcase *tcase,
const char *name,
bool (*run) (struct torture_context *,
const void *tcase_data,
const void *test_data),
bool (*run) (struct torture_context *, const void *tcase_data, const void *test_data),
const void *data)
{
struct torture_test *test = talloc(tcase, struct torture_test);
@ -335,7 +334,8 @@ bool torture_run_tcase(struct torture_context *context,
}
old_testname = context->active_testname;
context->active_testname = talloc_asprintf(context, "%s-%s", old_testname, tcase->name);
context->active_testname = talloc_asprintf(context, "%s-%s",
old_testname, tcase->name);
for (test = tcase->tests; test; test = test->next) {
ret &= internal_torture_run_test(context, tcase, test,
tcase->fixture_persistent);
@ -383,7 +383,8 @@ bool torture_setting_bool(struct torture_context *test, const char *name,
return lp_parm_bool(global_loadparm, NULL, "torture", name, default_value);
}
const char *torture_setting_string(struct torture_context *test, const char *name,
const char *torture_setting_string(struct torture_context *test,
const char *name,
const char *default_value)
{
const char *ret = lp_parm_string(global_loadparm, NULL, "torture", name);
@ -406,8 +407,7 @@ static bool wrap_test_with_simple_tcase(struct torture_context *torture_ctx,
}
struct torture_tcase *torture_suite_add_simple_tcase(
struct torture_suite *suite,
const char *name,
struct torture_suite *suite, const char *name,
bool (*run) (struct torture_context *test, const void *),
const void *data)
{