summaryrefslogtreecommitdiff
path: root/common/lib/libprop/prop_array.c
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2006-05-28 03:53:51 +0000
committerthorpej <thorpej@NetBSD.org>2006-05-28 03:53:51 +0000
commit42e8dee34631e017f072502ee6e754ef6778a79f (patch)
tree1dd8e85429568512fb5a11540d32d145a79c940f /common/lib/libprop/prop_array.c
parent48404677c41a8407ec1f920d3ec710408cf5f942 (diff)
Fix the way that prop_array_ensure_capacity() and _prop_array_expand()
interact.
Diffstat (limited to 'common/lib/libprop/prop_array.c')
-rw-r--r--common/lib/libprop/prop_array.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/common/lib/libprop/prop_array.c b/common/lib/libprop/prop_array.c
index cb7c82ce1ee..771dc24c8ef 100644
--- a/common/lib/libprop/prop_array.c
+++ b/common/lib/libprop/prop_array.c
@@ -1,4 +1,4 @@
-/* $NetBSD: prop_array.c,v 1.2 2006/05/18 03:05:19 thorpej Exp $ */
+/* $NetBSD: prop_array.c,v 1.3 2006/05/28 03:53:51 thorpej Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -210,11 +210,11 @@ _prop_array_expand(prop_array_t pa, unsigned int capacity)
oarray = pa->pa_array;
- array = _PROP_CALLOC(capacity * sizeof(prop_object_t), M_PROP_ARRAY);
+ array = _PROP_CALLOC(capacity * sizeof(*array), M_PROP_ARRAY);
if (array == NULL)
return (FALSE);
if (oarray != NULL)
- memcpy(array, oarray, pa->pa_capacity * sizeof(prop_object_t));
+ memcpy(array, oarray, pa->pa_capacity * sizeof(*array));
pa->pa_array = array;
pa->pa_capacity = capacity;
@@ -362,7 +362,7 @@ prop_array_ensure_capacity(prop_array_t pa, unsigned int capacity)
_PROP_ASSERT(prop_object_is_array(pa));
if (capacity > pa->pa_capacity)
- return (_prop_array_expand(pa, capacity - pa->pa_capacity));
+ return (_prop_array_expand(pa, capacity));
return (TRUE);
}