Don't pass the vector's capacity as a parameter to vector_reserve

2 files changed, 7 insertions, 7 deletions

diff --git a/Alc/helpers.c b/Alc/helpers.c
index 99ee2402..65c956ec 100644
--- a/Alc/helpers.c
+++ b/Alc/helpers.c
@@ -750,11 +750,11 @@ void WriteUnlock(RWLock *lock)
 }
 
 
-ALboolean vector_reserve(void *ptr, size_t orig_count, size_t base_size, size_t obj_count, size_t obj_size, ALboolean exact)
+ALboolean vector_reserve(void *ptr, size_t base_size, size_t obj_count, size_t obj_size, ALboolean exact)
 {
-    if(orig_count < obj_count)
+    vector_ *vecptr = ptr;
+    if((size_t)(*vecptr)->Capacity < obj_count)
     {
-        vector_ *vecptr = ptr;
         void *temp;
 
         /* Limit vector sizes to the greatest power-of-two value that an
@@ -784,7 +784,7 @@ ALboolean vector_reserve(void *ptr, size_t orig_count, size_t base_size, size_t
 ALboolean vector_resize(void *ptr, size_t base_size, size_t obj_count, size_t obj_size)
 {
     vector_ *vecptr = ptr;
-    if(!vector_reserve(vecptr, (*vecptr)->Capacity, base_size, obj_count, obj_size, AL_TRUE))
+    if(!vector_reserve(vecptr, base_size, obj_count, obj_size, AL_TRUE))
         return AL_FALSE;
     (*vecptr)->Size = (ALsizei)obj_count;
     return AL_TRUE;
diff --git a/Alc/vector.h b/Alc/vector.h
index 7ff65146..4c994581 100644
--- a/Alc/vector.h
+++ b/Alc/vector.h
@@ -22,8 +22,8 @@ typedef const struct vector_##T##_s *const_vector_##T;
 #define VECTOR_DEINIT(_x) do { free((_x)); (_x) = NULL; } while(0)
 
 /* Helper to increase a vector's reserve. Do not call directly. */
-ALboolean vector_reserve(void *ptr, size_t orig_count, size_t base_size, size_t obj_count, size_t obj_size, ALboolean exact);
-#define VECTOR_RESERVE(_x, _c) (vector_reserve(&(_x), (_x)->Capacity, sizeof(*(_x)), (_c), sizeof((_x)->Data[0]), AL_TRUE))
+ALboolean vector_reserve(void *ptr, size_t base_size, size_t obj_count, size_t obj_size, ALboolean exact);
+#define VECTOR_RESERVE(_x, _c) (vector_reserve(&(_x), sizeof(*(_x)), (_c), sizeof((_x)->Data[0]), AL_TRUE))
 
 /* Helper to change a vector's size. Do not call directly. */
 ALboolean vector_resize(void *ptr, size_t base_size, size_t obj_count, size_t obj_size);
@@ -35,7 +35,7 @@ ALboolean vector_resize(void *ptr, size_t base_size, size_t obj_count, size_t ob
 #define VECTOR_ITER_BEGIN(_x) ((_x)->Data)
 #define VECTOR_ITER_END(_x)   ((_x)->Data + (_x)->Size)
 
-#define VECTOR_PUSH_BACK(_x, _obj) (vector_reserve(&(_x), (_x)->Capacity, sizeof(*(_x)), (_x)->Size+1, sizeof((_x)->Data[0]), AL_FALSE) && \
+#define VECTOR_PUSH_BACK(_x, _obj) (vector_reserve(&(_x), sizeof(*(_x)), (_x)->Size+1, sizeof((_x)->Data[0]), AL_FALSE) && \
                                     (((_x)->Data[(_x)->Size++] = (_obj)),AL_TRUE))
 #define VECTOR_POP_BACK(_x) ((void)((_x)->Size--))