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 is incomplete the function itself still has the wrong prototype
and returns -1 in one case.

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

This needs to be squashed to
http://git.samba.org/?p=abartlet/samba.git/.git;a=commitdiff;h=0264c3b4c2320d258160ab0e9cb4d73a4fd74c93

BTW: thanks for making small commits, it's much easier to review:-)

But note that I only looked for high level bugs, I haven't verified that
every little
detail is correct...

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/a28c4758/attachment.pgp>