From 83bdb1a293ed81d753eb9ed00734444d98e02f0d Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Tue, 5 Jan 2010 09:40:26 -0800 Subject: [PATCH 2/8] Change uint_t to unsigned int in lib/talloc --- lib/talloc/talloc.3.xml | 6 +++--- lib/talloc/talloc_guide.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/talloc/talloc.3.xml b/lib/talloc/talloc.3.xml index 8d9e082..cc36f60 100644 --- a/lib/talloc/talloc.3.xml +++ b/lib/talloc/talloc.3.xml @@ -689,7 +689,7 @@ if (ptr) memcpy(ptr, p, strlen(p)+1); talloc_set_name_const(ptr, ptr) - (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: @@ -699,14 +699,14 @@ if (ptr) memcpy(ptr, p, strlen(p)+1); multiply, 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 diff --git a/lib/talloc/talloc_guide.txt b/lib/talloc/talloc_guide.txt index 01de806..79387bf 100644 --- a/lib/talloc/talloc_guide.txt +++ b/lib/talloc/talloc_guide.txt @@ -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 -- 1.6.6