diff options
| author | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
| commit | 378e4d5b8d30733f0f28cc2bceb28d9b9b594707 (patch) | |
| tree | 9f6faebdcf58c73e0297bfdf3b905ef256f8e478 /lib/util | |
| parent | 2f249538ac8f2a54d9c8f8dbf0107db2f33bfe16 (diff) | |
| parent | 6b266b85cf34145ac1f03d8f787b81121e4ec92b (diff) | |
| download | samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.gz samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.bz2 samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'lib/util')
| -rw-r--r-- | lib/util/charset/tests/iconv.c | 10 | ||||
| -rw-r--r-- | lib/util/tests/strlist.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/util/charset/tests/iconv.c b/lib/util/charset/tests/iconv.c index 178192ec2d..2b6679e799 100644 --- a/lib/util/charset/tests/iconv.c +++ b/lib/util/charset/tests/iconv.c @@ -35,7 +35,7 @@ static bool iconv_untestable(struct torture_context *tctx) { iconv_t cd; - if (!lp_parm_bool(tctx->lp_ctx, NULL, "iconv", "native", true)) + if (!lpcfg_parm_bool(tctx->lp_ctx, NULL, "iconv", "native", true)) torture_skip(tctx, "system iconv disabled - skipping test"); cd = iconv_open("UTF-16LE", "UCS-4LE"); @@ -158,8 +158,8 @@ static bool test_buffer(struct torture_context *test, "failed to open %s to UTF-16LE", charset)); } - cd2 = smb_iconv_open_ex(test, charset, "UTF-16LE", lp_parm_bool(test->lp_ctx, NULL, "iconv", "native", true)); - cd3 = smb_iconv_open_ex(test, "UTF-16LE", charset, lp_parm_bool(test->lp_ctx, NULL, "iconv", "native", true)); + cd2 = smb_iconv_open_ex(test, charset, "UTF-16LE", lpcfg_parm_bool(test->lp_ctx, NULL, "iconv", "native", true)); + cd3 = smb_iconv_open_ex(test, "UTF-16LE", charset, lpcfg_parm_bool(test->lp_ctx, NULL, "iconv", "native", true)); last_charset = charset; } @@ -289,7 +289,7 @@ static bool test_codepoint(struct torture_context *tctx, unsigned int codepoint) size_t size, size2; codepoint_t c; - size = push_codepoint_convenience(lp_iconv_convenience(tctx->lp_ctx), (char *)buf, codepoint); + size = push_codepoint_convenience(lpcfg_iconv_convenience(tctx->lp_ctx), (char *)buf, codepoint); torture_assert(tctx, size != -1 || (codepoint >= 0xd800 && codepoint <= 0x10000), "Invalid Codepoint range"); @@ -300,7 +300,7 @@ static bool test_codepoint(struct torture_context *tctx, unsigned int codepoint) buf[size+2] = random(); buf[size+3] = random(); - c = next_codepoint_convenience(lp_iconv_convenience(tctx->lp_ctx), (char *)buf, &size2); + c = next_codepoint_convenience(lpcfg_iconv_convenience(tctx->lp_ctx), (char *)buf, &size2); torture_assert(tctx, c == codepoint, talloc_asprintf(tctx, diff --git a/lib/util/tests/strlist.c b/lib/util/tests/strlist.c index bf5624383c..ce7d1e4e9b 100644 --- a/lib/util/tests/strlist.c +++ b/lib/util/tests/strlist.c @@ -376,8 +376,8 @@ static bool test_list_unique_2(struct torture_context *tctx) const char **list = (const char **)str_list_make_empty(tctx); const char **list_dup = (const char **)str_list_make_empty(tctx); - count = lp_parm_int(tctx->lp_ctx, NULL, "list_unique", "count", 9); - num_dups = lp_parm_int(tctx->lp_ctx, NULL, "list_unique", "dups", 7); + count = lpcfg_parm_int(tctx->lp_ctx, NULL, "list_unique", "count", 9); + num_dups = lpcfg_parm_int(tctx->lp_ctx, NULL, "list_unique", "dups", 7); torture_comment(tctx, "test_list_unique_2() with %d elements and %d dups\n", count, num_dups); for (i = 0; i < count; i++) { |