aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Alc/alstring.h2
-rw-r--r--Alc/helpers.c27
-rw-r--r--Alc/midi/sf2load.c8
-rw-r--r--Alc/vector.h16
4 files changed, 23 insertions, 30 deletions
diff --git a/Alc/alstring.h b/Alc/alstring.h
index 32f4280a..8791fbc0 100644
--- a/Alc/alstring.h
+++ b/Alc/alstring.h
@@ -15,7 +15,7 @@ inline void al_string_deinit(al_string *str)
#define AL_STRING_INIT_STATIC() ((al_string)NULL)
#define AL_STRING_DEINIT(_x) al_string_deinit(&(_x))
-inline ALsizei al_string_length(const_al_string str)
+inline size_t al_string_length(const_al_string str)
{ return VECTOR_SIZE(str); }
inline ALboolean al_string_empty(const_al_string str)
diff --git a/Alc/helpers.c b/Alc/helpers.c
index 6cb28e3d..0e69b195 100644
--- a/Alc/helpers.c
+++ b/Alc/helpers.c
@@ -638,11 +638,9 @@ void SetRTPriority(void)
}
-ALboolean vector_reserve(char *ptr, size_t base_size, size_t obj_size, ALsizei obj_count, ALboolean exact)
+ALboolean vector_reserve(char *ptr, size_t base_size, size_t obj_size, size_t obj_count, ALboolean exact)
{
vector_ *vecptr = (vector_*)ptr;
- if(obj_count < 0)
- return AL_FALSE;
if((*vecptr ? (*vecptr)->Capacity : 0) < obj_count)
{
ALsizei old_size = (*vecptr ? (*vecptr)->Size : 0);
@@ -652,11 +650,8 @@ ALboolean vector_reserve(char *ptr, size_t base_size, size_t obj_size, ALsizei o
* amount. This is preferred when regularly increasing the vector since
* it means fewer reallocations. Though it means it also wastes some
* memory. */
- if(exact == AL_FALSE)
- {
+ if(exact == AL_FALSE && obj_count < INT_MAX)
obj_count = NextPowerOf2((ALuint)obj_count);
- if(obj_count < 0) return AL_FALSE;
- }
/* Need to be explicit with the caller type's base size, because it
* could have extra padding before the start of the array (that is,
@@ -671,11 +666,9 @@ ALboolean vector_reserve(char *ptr, size_t base_size, size_t obj_size, ALsizei o
return AL_TRUE;
}
-ALboolean vector_resize(char *ptr, size_t base_size, size_t obj_size, ALsizei obj_count)
+ALboolean vector_resize(char *ptr, size_t base_size, size_t obj_size, size_t obj_count)
{
vector_ *vecptr = (vector_*)ptr;
- if(obj_count < 0)
- return AL_FALSE;
if(*vecptr || obj_count > 0)
{
if(!vector_reserve((char*)vecptr, base_size, obj_size, obj_count, AL_TRUE))
@@ -696,12 +689,12 @@ ALboolean vector_insert(char *ptr, size_t base_size, size_t obj_size, void *ins_
ptrdiff_t numins = ((const char*)datend - (const char*)datstart) / obj_size;
assert(numins > 0);
- if(INT_MAX-VECTOR_SIZE(*vecptr) <= numins ||
+ if((size_t)numins + VECTOR_SIZE(*vecptr) < (size_t)numins ||
!vector_reserve((char*)vecptr, base_size, obj_size, VECTOR_SIZE(*vecptr)+numins, AL_TRUE))
return AL_FALSE;
/* NOTE: ins_pos may have been invalidated if *vecptr moved. Use ins_elem instead. */
- if(ins_elem < (*vecptr)->Size)
+ if((size_t)ins_elem < (*vecptr)->Size)
{
memmove((char*)(*vecptr) + base_size + ((ins_elem+numins)*obj_size),
(char*)(*vecptr) + base_size + ((ins_elem )*obj_size),
@@ -709,14 +702,14 @@ ALboolean vector_insert(char *ptr, size_t base_size, size_t obj_size, void *ins_
}
memcpy((char*)(*vecptr) + base_size + (ins_elem*obj_size),
datstart, numins*obj_size);
- (*vecptr)->Size += (ALsizei)numins;
+ (*vecptr)->Size += numins;
}
return AL_TRUE;
}
extern inline void al_string_deinit(al_string *str);
-extern inline ALsizei al_string_length(const_al_string str);
+extern inline size_t al_string_length(const_al_string str);
extern inline ALboolean al_string_empty(const_al_string str);
extern inline const al_string_char_type *al_string_get_cstr(const_al_string str);
@@ -730,10 +723,10 @@ void al_string_clear(al_string *str)
*VECTOR_ITER_END(*str) = 0;
}
-static inline int al_string_compare(const al_string_char_type *str1, ALsizei str1len,
- const al_string_char_type *str2, ALsizei str2len)
+static inline int al_string_compare(const al_string_char_type *str1, size_t str1len,
+ const al_string_char_type *str2, size_t str2len)
{
- ALsizei complen = mini(str1len, str2len);
+ size_t complen = (str1len > str2len) ? str1len : str2len;
int ret = memcmp(str1, str2, complen);
if(ret == 0)
{
diff --git a/Alc/midi/sf2load.c b/Alc/midi/sf2load.c
index 233f7983..29a487f6 100644
--- a/Alc/midi/sf2load.c
+++ b/Alc/midi/sf2load.c
@@ -364,7 +364,7 @@ static void GenModList_insertGen(GenModList *self, const Generator *gen, ALboole
if(VECTOR_PUSH_BACK(self->gens, *gen) == AL_FALSE)
{
- ERR("Failed to insert generator (from %d elements)\n", VECTOR_SIZE(self->gens));
+ ERR("Failed to insert generator (from %lu elements)\n", VECTOR_SIZE(self->gens));
return;
}
}
@@ -393,7 +393,7 @@ static void GenModList_accumGen(GenModList *self, const Generator *gen)
if(VECTOR_PUSH_BACK(self->gens, *gen) == AL_FALSE)
{
- ERR("Failed to insert generator (from %d elements)\n", VECTOR_SIZE(self->gens));
+ ERR("Failed to insert generator (from %lu elements)\n", VECTOR_SIZE(self->gens));
return;
}
if(gen->mGenerator < 60)
@@ -416,7 +416,7 @@ static void GenModList_insertMod(GenModList *self, const Modulator *mod)
if(VECTOR_PUSH_BACK(self->mods, *mod) == AL_FALSE)
{
- ERR("Failed to insert modulator (from %d elements)\n", VECTOR_SIZE(self->mods));
+ ERR("Failed to insert modulator (from %lu elements)\n", VECTOR_SIZE(self->mods));
return;
}
}
@@ -436,7 +436,7 @@ static void GenModList_accumMod(GenModList *self, const Modulator *mod)
if(VECTOR_PUSH_BACK(self->mods, *mod) == AL_FALSE)
{
- ERR("Failed to insert modulator (from %d elements)\n", VECTOR_SIZE(self->mods));
+ ERR("Failed to insert modulator (from %lu elements)\n", VECTOR_SIZE(self->mods));
return;
}
diff --git a/Alc/vector.h b/Alc/vector.h
index 9f28d0db..85230378 100644
--- a/Alc/vector.h
+++ b/Alc/vector.h
@@ -7,21 +7,21 @@
/* "Base" vector type, designed to alias with the actual vector types. */
typedef struct vector__s {
- ALsizei Capacity;
- ALsizei Size;
+ size_t Capacity;
+ size_t Size;
} *vector_;
#define TYPEDEF_VECTOR(T, N) typedef struct { \
- ALsizei Capacity; \
- ALsizei Size; \
+ size_t Capacity; \
+ size_t Size; \
T Data[]; \
} _##N; \
typedef _##N* N; \
typedef const _##N* const_##N;
#define VECTOR(T) struct { \
- ALsizei Capacity; \
- ALsizei Size; \
+ size_t Capacity; \
+ size_t Size; \
T Data[]; \
}*
@@ -30,10 +30,10 @@ typedef const _##N* const_##N;
#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(char *ptr, size_t base_size, size_t obj_size, ALsizei obj_count, ALboolean exact);
+ALboolean vector_reserve(char *ptr, size_t base_size, size_t obj_size, size_t obj_count, ALboolean exact);
#define VECTOR_RESERVE(_x, _c) (vector_reserve((char*)&(_x), sizeof(*(_x)), sizeof((_x)->Data[0]), (_c), AL_TRUE))
-ALboolean vector_resize(char *ptr, size_t base_size, size_t obj_size, ALsizei obj_count);
+ALboolean vector_resize(char *ptr, size_t base_size, size_t obj_size, size_t obj_count);
#define VECTOR_RESIZE(_x, _c) (vector_resize((char*)&(_x), sizeof(*(_x)), sizeof((_x)->Data[0]), (_c)))
#define VECTOR_CAPACITY(_x) ((_x) ? (_x)->Capacity : 0)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 13:41:35 +0000