summaryrefslogtreecommitdiff
path: root/source3/lib/charcnv.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-03-15 16:12:52 +0000
committerGerald Carter <jerry@samba.org>2004-03-15 16:12:52 +0000
commit11f6251b771e59020af02599ea419e7d7ff682de (patch)
tree3fb38a5d70e45cf36d39fb4690a94b0e9b747833 /source3/lib/charcnv.c
parent12fb2d73050a911c7a86749be3639b2c1da84059 (diff)
downloadsamba-11f6251b771e59020af02599ea419e7d7ff682de.tar.gz
samba-11f6251b771e59020af02599ea419e7d7ff682de.tar.bz2
samba-11f6251b771e59020af02599ea419e7d7ff682de.zip
sync small fixes from 3.0 and fix compiler warning in priv code
(This used to be commit c640594c9362dca625a8fa51b453dafe1f3e980d)
Diffstat (limited to 'source3/lib/charcnv.c')
-rw-r--r--source3/lib/charcnv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index c2213c966d..20af806d90 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -1110,7 +1110,7 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_
if (ucs2_align(base_ptr, src, flags)) {
src = (const void *)((const char *)src + 1);
- if (src_len > 0)
+ if (src_len != (size_t)-1)
src_len--;
}