* \author Michal Krol
*/
-#include "imports.h"
+#include "main/imports.h"
#include "slang_storage.h"
+#include "slang_mem.h"
/* slang_storage_array */
{
if (arr->aggregate != NULL) {
slang_storage_aggregate_destruct(arr->aggregate);
- slang_alloc_free(arr->aggregate);
+ _slang_free(arr->aggregate);
}
}
for (i = 0; i < agg->count; i++)
slang_storage_array_destruct(agg->arrays + i);
- slang_alloc_free(agg->arrays);
+ _slang_free(agg->arrays);
}
static slang_storage_array *
slang_storage_array *arr = NULL;
agg->arrays = (slang_storage_array *)
- slang_alloc_realloc(agg->arrays,
- agg->count * sizeof(slang_storage_array),
- (agg->count + 1) * sizeof(slang_storage_array));
+ _slang_realloc(agg->arrays,
+ agg->count * sizeof(slang_storage_array),
+ (agg->count + 1) * sizeof(slang_storage_array));
if (agg->arrays != NULL) {
arr = agg->arrays + agg->count;
if (!slang_storage_array_construct(arr))
return GL_FALSE;
arr->type = SLANG_STORE_AGGREGATE;
arr->length = columns;
- arr->aggregate =
- (slang_storage_aggregate *)
- slang_alloc_malloc(sizeof(slang_storage_aggregate));
+ arr->aggregate = (slang_storage_aggregate *)
+ _slang_alloc(sizeof(slang_storage_aggregate));
if (arr->aggregate == NULL)
return GL_FALSE;
if (!slang_storage_aggregate_construct(arr->aggregate)) {
- slang_alloc_free(arr->aggregate);
+ _slang_free(arr->aggregate);
arr->aggregate = NULL;
return GL_FALSE;
}
if (arr == NULL)
return GL_FALSE;
arr->type = SLANG_STORE_AGGREGATE;
- arr->aggregate =
- (slang_storage_aggregate *)
- slang_alloc_malloc(sizeof(slang_storage_aggregate));
+ arr->aggregate = (slang_storage_aggregate *)
+ _slang_alloc(sizeof(slang_storage_aggregate));
if (arr->aggregate == NULL)
return GL_FALSE;
if (!slang_storage_aggregate_construct(arr->aggregate)) {
- slang_alloc_free(arr->aggregate);
+ _slang_free(arr->aggregate);
arr->aggregate = NULL;
return GL_FALSE;
}