git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f6ce7e0
)
Fix some warnings
author
Volker Lendecke
<vl@samba.org>
Sat, 4 Jul 2009 08:35:21 +0000
(10:35 +0200)
committer
Volker Lendecke
<vl@samba.org>
Sat, 4 Jul 2009 10:54:22 +0000
(12:54 +0200)
lib/talloc/talloc.c
patch
|
blob
|
history
diff --git
a/lib/talloc/talloc.c
b/lib/talloc/talloc.c
index 8ccebe2e24eb37d4c304dd43b2ff0ce785469821..0126567c45a5e4f528221fea98162f7d48cc775b 100644
(file)
--- 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;
}
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 *_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;
}
(*pptr) = NULL;
return ret;
}
@@
-1905,6
+1905,7
@@
void *_talloc_steal(const void *new_ctx, const void *ptr)
}
#undef talloc_free
}
#undef talloc_free
+int talloc_free(void *ptr);
int talloc_free(void *ptr)
{
return _talloc_free_internal(ptr);
int talloc_free(void *ptr)
{
return _talloc_free_internal(ptr);