struct memblock_t {
const char *file;
unsigned int line;
- unsigned int byte;
+ size_t byte;
struct memblock_t *next;
struct memblock_t *prev;
};
static struct memblock_t *mem_start = NULL;
-void *util_memory_a(unsigned int byte, unsigned int line, const char *file) {
+void *util_memory_a(size_t byte, unsigned int line, const char *file) {
struct memblock_t *info = malloc(sizeof(struct memblock_t) + byte);
void *data = (void*)(info+1);
if (!info) return NULL;
free(info);
}
-void *util_memory_r(void *ptrn, unsigned int byte, unsigned int line, const char *file) {
+void *util_memory_r(void *ptrn, size_t byte, unsigned int line, const char *file) {
struct memblock_t *oldinfo = NULL;
struct memblock_t *newinfo;
if (!ptrn)
return util_memory_a(byte, line, file);
+ if (!byte) {
+ util_memory_d(ptrn, line, file);
+ return NULL;
+ }
oldinfo = ((struct memblock_t*)ptrn - 1);
- newinfo = malloc(sizeof(struct memblock_t) + byte);
+ newinfo = ((struct memblock_t*)malloc(sizeof(struct memblock_t) + byte));
util_debug("MEM", "reallocation: % 8u -> %u (bytes) address 0x%08X -> 0x%08X @ %s:%u\n", oldinfo->byte, byte, ptrn, (void*)(newinfo+1), file, line);
util_memory_d(oldinfo+1, line, file);
return NULL;
}
+
+ /* copy old */
+ memcpy(newinfo+1, oldinfo+1, oldinfo->byte);
+
+ /* free old */
+ if (oldinfo->prev)
+ oldinfo->prev->next = oldinfo->next;
+ if (oldinfo->next)
+ oldinfo->next->prev = oldinfo->prev;
+ if (oldinfo == mem_start)
+ mem_start = oldinfo->next;
+
+ /* fill info */
newinfo->line = line;
newinfo->byte = byte;
newinfo->file = file;
- newinfo->next = oldinfo->next;
- newinfo->prev = oldinfo->prev;
- if (mem_start == oldinfo)
- mem_start = newinfo;
+ newinfo->prev = NULL;
+ newinfo->next = mem_start;
+ if (mem_start)
+ mem_start->prev = newinfo;
+ mem_start = newinfo;
- /* copy old */
- memcpy(newinfo+1, oldinfo+1, oldinfo->byte);
+ mem_ab -= oldinfo->byte;
+ mem_ab += newinfo->byte;
- /* drop old */
- mem_db += newinfo->byte;
- mem_db -= oldinfo->byte;
free(oldinfo);
- /* update */
return newinfo+1;
}
return;
va_start(va, ms);
- fprintf (stdout, "DEBUG: ");
- fputc ('[', stdout);
- fprintf(stdout, "%s", area);
- fputs ("] ", stdout);
- vfprintf(stdout, ms, va);
+ con_out ("[%s] ", area);
+ con_vout(ms, va);
va_end (va);
}
#endif
}
+bool util_filexists(const char *file) {
+ FILE *fp = fopen(file, "rb");
+ if (!fp) return false;
+
+ /* it exists */
+ fclose(fp);
+ return true;
+}
+
+void _util_vec_grow(void **a, size_t i, size_t s) {
+ size_t m = *a ? 2*_vec_beg(*a)+i : i+1;
+ void *p = mem_r((*a ? _vec_raw(*a) : NULL), s * m + sizeof(size_t)*2);
+ if (!*a)
+ ((size_t*)p)[1] = 0;
+ *a = (void*)((size_t*)p + 2);
+ _vec_beg(*a) = m;
+}