diff options
author | Volker Lendecke <vl@samba.org> | 2009-07-04 10:35:21 +0200 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2009-07-04 12:54:22 +0200 |
commit | 5742ed128df90db400ff825bba7a939dadac8c30 (patch) | |
tree | 264890ce1b9f7517ae9fd6499bf12bb25dfb47bc /lib | |
parent | f6ce7e062547a788425d683e75a517a32c235bd0 (diff) | |
download | samba-5742ed128df90db400ff825bba7a939dadac8c30.tar.gz samba-5742ed128df90db400ff825bba7a939dadac8c30.tar.bz2 samba-5742ed128df90db400ff825bba7a939dadac8c30.zip |
Fix some warnings
Diffstat (limited to 'lib')
-rw-r--r-- | lib/talloc/talloc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c index 8ccebe2e24..0126567c45 100644 --- a/lib/talloc/talloc.c +++ b/lib/talloc/talloc.c @@ -723,7 +723,7 @@ void *talloc_reparent(const void *old_parent, const void *new_parent, const void if (_talloc_steal_internal(new_parent, h) != h) { return NULL; } - return ptr; + return (void *)ptr; } } @@ -1183,7 +1183,7 @@ void *_talloc_realloc(const void *context, void *ptr, size_t size, const char *n void *_talloc_move(const void *new_ctx, const void *_pptr) { const void **pptr = discard_const_p(const void *,_pptr); - void *ret = talloc_steal(new_ctx, *pptr); + void *ret = talloc_steal(new_ctx, (void *)*pptr); (*pptr) = NULL; return ret; } @@ -1905,6 +1905,7 @@ void *_talloc_steal(const void *new_ctx, const void *ptr) } #undef talloc_free +int talloc_free(void *ptr); int talloc_free(void *ptr) { return _talloc_free_internal(ptr); |