diff options
| author | Gerald Carter <jerry@samba.org> | 2004-03-15 16:12:52 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-03-15 16:12:52 +0000 |
| commit | 11f6251b771e59020af02599ea419e7d7ff682de (patch) | |
| tree | 3fb38a5d70e45cf36d39fb4690a94b0e9b747833 /source3/lib | |
| parent | 12fb2d73050a911c7a86749be3639b2c1da84059 (diff) | |
| download | samba-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')
| -rw-r--r-- | source3/lib/adt_tree.c | 6 | ||||
| -rw-r--r-- | source3/lib/charcnv.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/adt_tree.c b/source3/lib/adt_tree.c index 0bc224ec23..bd857e205a 100644 --- a/source3/lib/adt_tree.c +++ b/source3/lib/adt_tree.c @@ -65,7 +65,7 @@ SORTED_TREE* sorted_tree_init( void *data_p, ZERO_STRUCTP( tree ); tree->compare = cmp_fn; - tree->free = free_fn; + tree->free_func = free_fn; if ( !(tree->root = (TREE_NODE*)malloc( sizeof(TREE_NODE) )) ) { SAFE_FREE( tree ); @@ -110,8 +110,8 @@ void sorted_tree_destroy( SORTED_TREE *tree ) if ( tree->root ) sorted_tree_destroy_children( tree->root ); - if ( tree->free ) - tree->free( tree->root ); + if ( tree->free_func ) + tree->free_func( tree->root ); SAFE_FREE( tree ); } 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--; } |