diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-09 22:46:59 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-04-09 22:46:59 -0700 |
| commit | 7f10bf980edef3ace1522d0c9c082b35e225c950 (patch) | |
| tree | d4e9af21de194cca812e754b28f9358a3651f4ce /source3/torture/t_push_ucs2.c | |
| parent | f8f68703da58cf7f61b655b48bbbc45cda647748 (diff) | |
| parent | f930f504e1d5e78d2f6f36cab9ce36dbeb34e955 (diff) | |
| download | samba-7f10bf980edef3ace1522d0c9c082b35e225c950.tar.gz samba-7f10bf980edef3ace1522d0c9c082b35e225c950.tar.bz2 samba-7f10bf980edef3ace1522d0c9c082b35e225c950.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source3/torture/t_push_ucs2.c')
| -rw-r--r-- | source3/torture/t_push_ucs2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/torture/t_push_ucs2.c b/source3/torture/t_push_ucs2.c index b9bf87ba54..2bd91dafde 100644 --- a/source3/torture/t_push_ucs2.c +++ b/source3/torture/t_push_ucs2.c @@ -14,16 +14,16 @@ static int check_push_ucs2(const char *orig) int ret; size_t converted_size; - push_ucs2_allocate(&dest, orig, &converted_size); - pull_ucs2_allocate(&orig2, dest, &converted_size); + push_ucs2_talloc(NULL, &dest, orig, &converted_size); + pull_ucs2_talloc(NULL, &orig2, dest, &converted_size); ret = strcmp(orig, orig2); if (ret) { fprintf(stderr, "orig: %s\n", orig); fprintf(stderr, "orig (UNIX -> UCS2 -> UNIX): %s\n", orig2); } - SAFE_FREE(dest); - SAFE_FREE(orig2); + TALLOC_FREE(dest); + TALLOC_FREE(orig2); return ret; } |