interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FINALLY got rid of ptrArray. Woo!

This commit is contained in:
Pietro Gagliardi 2016-05-05 21:51:14 -04:00
parent 02fbb5a559
commit 9d2b637aa2
3 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/GNUfiles.mk
View File

@ -4,7 +4,6 @@ CFILES += \
common/areaevents.c \ common/areaevents.c \
common/control.c \ common/control.c \
common/matrix.c \ common/matrix.c \
common/ptrarray.c \
common/shouldquit.c common/shouldquit.c
HFILES += \ HFILES += \

49
common/ptrarray.c
View File

@ -1,49 +0,0 @@
// 5 may 2015
#include <string.h>
#include "../ui.h"
#include "uipriv.h"
struct ptrArray *newPtrArray(void)
{
return uiNew(struct ptrArray);
}
void ptrArrayDestroy(struct ptrArray *p)
{
if (p->len != 0)
complain("attempt to destroy ptrarray %p while it still has pointers inside", p);
if (p->ptrs != NULL) // array was created but nothing was ever put inside
uiFree(p->ptrs);
uiFree(p);
}
#define grow 32
void ptrArrayAppend(struct ptrArray *p, void *d)
{
ptrArrayInsertAt(p, p->len, d);
}
void ptrArrayInsertAt(struct ptrArray *p, uintmax_t i, void *d)
{
if (i > p->len)
complain("index out of range in ptrArrayInsertAt()");
if (p->len >= p->cap) {
p->cap += grow;
p->ptrs = (void **) uiRealloc(p->ptrs, p->cap * sizeof (void *), "void *[]");
}
// thanks to ValleyBell
memmove(&(p->ptrs[i + 1]), &(p->ptrs[i]), (p->len - i) * sizeof (void *));
p->ptrs[i] = d;
p->len++;
}
void ptrArrayDelete(struct ptrArray *p, uintmax_t i)
{
if (i >= p->len)
complain("index out of range in ptrArrayRemove()");
// thanks to ValleyBell
memmove(&(p->ptrs[i]), &(p->ptrs[i + 1]), (p->len - i - 1) * sizeof (void *));
p->ptrs[p->len - 1] = NULL;
p->len--;
}

13
common/uipriv.h
View File

@ -19,19 +19,6 @@ extern void complain(const char *, ...);
// control.c // control.c
extern uiControl *newControl(size_t size, uint32_t OSsig, uint32_t typesig, const char *typenamestr); extern uiControl *newControl(size_t size, uint32_t OSsig, uint32_t typesig, const char *typenamestr);
// ptrarray.c
struct ptrArray {
void **ptrs;
uintmax_t len;
uintmax_t cap;
};
struct ptrArray *newPtrArray(void);
void ptrArrayDestroy(struct ptrArray *);
void ptrArrayAppend(struct ptrArray *, void *);
void ptrArrayInsertAt(struct ptrArray *, uintmax_t, void *);
void ptrArrayDelete(struct ptrArray *, uintmax_t);
#define ptrArrayIndex(p, T, i) ((T) ((p)->ptrs[(i)]))
// shouldquit.c // shouldquit.c
extern int shouldQuit(void); extern int shouldQuit(void);