s4:auth Move struct auth_usersupplied_info to a common location

[samba.git] / lib / talloc / talloc_guide.txt

diff --git a/lib/talloc/talloc_guide.txt b/lib/talloc/talloc_guide.txt
index 3b6467a08301d35fd32ba05e2888cc5a247c912f..79387bfd46e5080f5a730bab7e5e8ab99e25ce66 100644 (file)
--- a/lib/talloc/talloc_guide.txt
+++ b/lib/talloc/talloc_guide.txt
@@ -131,10 +131,10 @@ For more control on which parent is removed, see talloc_unlink()
 
 talloc_free() operates recursively on its children.
 
-As a special case, talloc_free() is refused on pointers that have more
-than one parent, as talloc would have no way of knowing which parent
-should be removed. To free a pointer that has more than one parent
-please use talloc_unlink().
+From the 2.0 version of talloc, as a special case, talloc_free() is
+refused on pointers that have more than one parent, as talloc would
+have no way of knowing which parent should be removed. To free a
+pointer that has more than one parent please use talloc_unlink().
 
 To help you find problems in your code caused by this behaviour, if
 you do try and free a pointer with more than one parent then the
@@ -652,7 +652,7 @@ string. This is equivalent to::
 
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-((type *)talloc_array(const void *ctx, type, uint_t count);
+((type *)talloc_array(const void *ctx, type, unsigned int count);
 
 The talloc_array() macro is equivalent to::
 
@@ -663,14 +663,14 @@ returning NULL if the multiply overflows.
 
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-void *talloc_array_size(const void *ctx, size_t size, uint_t count);
+void *talloc_array_size(const void *ctx, size_t size, unsigned int count);
 
 The talloc_array_size() function is useful when the type is not
 known. It operates in the same way as talloc_array(), but takes a size
 instead of a type.
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-(typeof(ptr)) talloc_array_ptrtype(const void *ctx, ptr, uint_t count);
+(typeof(ptr)) talloc_array_ptrtype(const void *ctx, ptr, unsigned int count);
 
 The talloc_ptrtype() macro should be used when you have a pointer to an array
 and want to allocate memory of an array to point at with this pointer. When compiling