diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-21 18:04:47 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-21 18:04:47 +0200 |
| commit | 20796bcf57a7f5e1921dc12e0568221f985fe4f2 (patch) | |
| tree | 8f0540a602a9ea0031d656bc31c0b8bc1e91eb70 /source3/modules/vfs_catia.c | |
| parent | 323be4a6907e4915bb76aa103bf5b868f0b459b1 (diff) | |
| parent | 1a416ff13ca7786f2e8d24c66addf00883e9cb12 (diff) | |
| download | samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.tar.gz samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.tar.bz2 samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.zip | |
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into docbook
Conflicts:
source/Makefile.in
(This used to be commit 01987778a123f853fccdcb7fe9566143e2d7c490)
Diffstat (limited to 'source3/modules/vfs_catia.c')
| -rw-r--r-- | source3/modules/vfs_catia.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c index 8b56be6cea..7ffb310975 100644 --- a/source3/modules/vfs_catia.c +++ b/source3/modules/vfs_catia.c @@ -36,12 +36,13 @@ static char *catia_string_replace(TALLOC_CTX *ctx, smb_ucs2_t *ptr = NULL; smb_ucs2_t old = oldc; char *ret = NULL; + size_t converted_size; if (!s) { return NULL; } - if (push_ucs2_talloc(ctx, &tmpbuf, s) == -1) { + if (!push_ucs2_talloc(ctx, &tmpbuf, s, &converted_size)) { return NULL; } @@ -53,7 +54,7 @@ static char *catia_string_replace(TALLOC_CTX *ctx, } } - if (pull_ucs2_talloc(ctx, &ret, tmpbuf) == -1) { + if (!pull_ucs2_talloc(ctx, &ret, tmpbuf, &converted_size)) { TALLOC_FREE(tmpbuf); return NULL; } |