summaryrefslogtreecommitdiff
path: root/source4/lib/talloc.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-06-01 10:12:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:23 -0500
commit770e3307ce3da928762e15a136c562df86a9c799 (patch)
tree95930ce042b039faad683515a13e1d8413871b5d /source4/lib/talloc.c
parent98d291423ff581786a369ce373c861f94c654aa0 (diff)
downloadsamba-770e3307ce3da928762e15a136c562df86a9c799.tar.gz
samba-770e3307ce3da928762e15a136c562df86a9c799.tar.bz2
samba-770e3307ce3da928762e15a136c562df86a9c799.zip
r962: convert 'unsigned' and 'unsigned int' to uint_t
metze (This used to be commit 57151e80eb1090281401930c8fe25b20a8cf3a38)
Diffstat (limited to 'source4/lib/talloc.c')
-rw-r--r--source4/lib/talloc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/talloc.c b/source4/lib/talloc.c
index 92e0d52d2d..f3cdd75231 100644
--- a/source4/lib/talloc.c
+++ b/source4/lib/talloc.c
@@ -53,7 +53,7 @@ struct talloc_chunk {
TALLOC_CTX *context;
size_t size;
void *ptr;
- unsigned magic;
+ uint_t magic;
};
@@ -492,7 +492,7 @@ char *talloc_describe_all(TALLOC_CTX *rt)
if (!rt) return NULL;
s = talloc_asprintf(rt, "global talloc allocations in pid: %u\n",
- (unsigned) getpid());
+ (uint_t) getpid());
s = talloc_asprintf_append(rt, s, "%-40s %8s %8s\n",
"name", "chunks", "bytes");
s = talloc_asprintf_append(rt, s, "%-40s %8s %8s\n",
@@ -517,8 +517,8 @@ char *talloc_describe_all(TALLOC_CTX *rt)
s = talloc_asprintf_append(rt, s, "%-40s %8u %8u\n",
what,
- (unsigned) n_chunks,
- (unsigned) bytes);
+ (uint_t) n_chunks,
+ (uint_t) bytes);
total_bytes += bytes;
total_chunks += n_chunks;
}
@@ -532,7 +532,7 @@ char *talloc_describe_all(TALLOC_CTX *rt)
s = talloc_asprintf_append(rt, s, "%-40s %8u %8u\n",
"TOTAL",
- (unsigned) total_chunks, (unsigned) total_bytes);
+ (uint_t) total_chunks, (uint_t) total_bytes);
return s;
}
@@ -563,7 +563,7 @@ void talloc_get_allocation(TALLOC_CTX *t,
/*
realloc an array, checking for integer overflow in the array size
*/
-void *talloc_realloc_array(TALLOC_CTX *ctx, void *ptr, size_t el_size, unsigned count)
+void *talloc_realloc_array(TALLOC_CTX *ctx, void *ptr, size_t el_size, uint_t count)
{
if (count == 0 ||
count >= MAX_TALLOC_SIZE/el_size) {