patches to merge string and charset code

[Stefan (metze) Metzmacher]

Hi Andrew,

> It is in
> http://git.samba.org/?p=abartlet/samba.git/.git;a=shortlog;h=refs/heads/merge-str
> 

This one does more than the commit message says:

http://git.samba.org/?p=abartlet/samba.git/.git;a=commitdiff;h=106ef1fa2d30bc650e78545074b917e94b8453cf

+++ b/source3/lib/charcnv.c
@@ -864,7 +864,7 @@ size_t push_ucs2(const void *base_ptr, void *dest,
const char *src, size_t dest_
        }

        if (flags & STR_TERMINATE)
-               src_len = (size_t)-1;
+               src_len =  strlen(src) + 1;
        else
                src_len = strlen(src);


I'm not sure if this change is correct, at least it needs its own commit.

metze

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20110412/8d285916/attachment.pgp>