Browse Source

talloc_free() should take a const void *, a-la free().

Rusty Russell 16 years ago
parent
commit
d419d5c947
2 changed files with 3 additions and 3 deletions
  1. 2 2
      ccan/talloc/talloc.c
  2. 1 1
      ccan/talloc/talloc.h

+ 2 - 2
ccan/talloc/talloc.c

@@ -819,12 +819,12 @@ void *talloc_named_const(const void *context, size_t size, const char *name)
    will not be freed if the ref_count is > 1 or the destructor (if
    any) returns non-zero
 */
-int talloc_free(void *ptr)
+int talloc_free(const void *ptr)
 {
 	int saved_errno = errno, ret;
 
 	lock(ptr);
-	ret = _talloc_free(ptr);
+	ret = _talloc_free(discard_const_p(void, ptr));
 	unlock();
 	if (ret == 0)
 		errno = saved_errno;

+ 1 - 1
ccan/talloc/talloc.h

@@ -119,7 +119,7 @@
  * See Also:
  *	talloc_set_destructor, talloc_unlink
  */
-int talloc_free(void *ptr);
+int talloc_free(const void *ptr);
 
 /**
  * talloc_set_destructor: set a destructor for when this pointer is freed