diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-04 01:51:44 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:04 +0100 |
| commit | 6901b3c64a65d9745efac13f071225d5d2949f4d (patch) | |
| tree | 3080eea5818c581371ace8178aa50156ff35c29a /source4/torture | |
| parent | 9ebcd7a0df117158f1817b7d3a9a21ad4e1fa97a (diff) | |
| download | samba-6901b3c64a65d9745efac13f071225d5d2949f4d.tar.gz samba-6901b3c64a65d9745efac13f071225d5d2949f4d.tar.bz2 samba-6901b3c64a65d9745efac13f071225d5d2949f4d.zip | |
r26278: Tallocify convenience table for iconv handles.
(This used to be commit ad64b3baa4a5383c603d17ae75c33083af4690bb)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/masktest.c | 2 | ||||
| -rw-r--r-- | source4/torture/smbtorture.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index 2455361e10..c2e3d7b1dd 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -310,7 +310,7 @@ static void usage(void) seed = time(NULL); - close_iconv(); + reload_charcnv(); while ((opt = getopt(argc, argv, "n:d:U:s:hm:f:aoW:M:vEl:")) != EOF) { switch (opt) { diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index ef6484ebc9..33e80a4b97 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -50,7 +50,7 @@ static bool run_matching(struct torture_context *torture, for (o = torture_root->children; o; o = o->next) { if (gen_fnmatch(expr, o->name) == 0) { *matched = true; - close_iconv(); + reload_charcnv(); ret &= torture_run_suite(torture, o); continue; } @@ -67,7 +67,7 @@ static bool run_matching(struct torture_context *torture, if (gen_fnmatch(expr, name) == 0) { *matched = true; - close_iconv(); + reload_charcnv(); torture->active_testname = talloc_strdup(torture, prefix); ret &= torture_run_suite(torture, c); free(name); @@ -83,7 +83,7 @@ static bool run_matching(struct torture_context *torture, asprintf(&name, "%s-%s", prefix, t->name); if (gen_fnmatch(expr, name) == 0) { *matched = true; - close_iconv(); + reload_charcnv(); torture->active_testname = talloc_strdup(torture, prefix); ret &= torture_run_tcase(torture, t); talloc_free(torture->active_testname); |