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

Fixed up ptrarray.c. Thanks to ValleyBell for help.

This commit is contained in:
Pietro Gagliardi 2015-05-06 13:11:39 -04:00
parent 8c3ca7fcce
commit b13d1ebd2c
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ptrarray.c
View File

@ -3,8 +3,6 @@
#include "ui.h" #include "ui.h"
#include "uipriv.h" #include "uipriv.h"
// TODO see if we can use memmove()
struct ptrArray newPtrArray(void) struct ptrArray newPtrArray(void)
{ {
return uiNew(struct ptrArray); return uiNew(struct ptrArray);
@ -21,12 +19,12 @@ void ptrArrayDestroy(struct ptrArray *p)
void ptrArrayAppend(struct ptrArray *p, void *d) void ptrArrayAppend(struct ptrArray *p, void *d)
{ {
p->len++;
if (p->len >= p->cap) { if (p->len >= p->cap) {
p->cap += grow; p->cap += grow;
p->ptrs = (void **) uiRealloc(p->ptrs, p->cap * sizeof (void *)); p->ptrs = (void **) uiRealloc(p->ptrs, p->cap * sizeof (void *));
} }
p->ptrs[p->len - 1] = d; p->ptrs[p->len] = d;
p->len++;
} }
void ptrArrayInsertBefore(struct ptrArray *p, uintmax_t i, void *d) void ptrArrayInsertBefore(struct ptrArray *p, uintmax_t i, void *d)
@ -35,15 +33,14 @@ void ptrArrayInsertBefore(struct ptrArray *p, uintmax_t i, void *d)
if (i >= p->len) if (i >= p->len)
complain("index out of range in ptrArrayInsertBefore()"); complain("index out of range in ptrArrayInsertBefore()");
// TODO does this need to be here
p->len++;
if (p->len >= p->cap) { if (p->len >= p->cap) {
p->cap += grow; p->cap += grow;
p->ptrs = (void **) uiRealloc(p->ptrs, p->cap * sizeof (void *)); p->ptrs = (void **) uiRealloc(p->ptrs, p->cap * sizeof (void *));
} }
for (j = p->len - 1; j >= i; j--) // thanks to ValleyBell
p->ptrs[j + 1] = p->ptrs[j]; memmove(&(p->ptrs[i + 1]), &(p->ptrs[i]), (p->len - i) * sizeof (void *));
p->ptrs[i] = d; p->ptrs[i] = d;
p->len++;
} }
void ptrArrayDelete(struct ptrArray *p, uintmax_t i) void ptrArrayDelete(struct ptrArray *p, uintmax_t i)
@ -52,8 +49,8 @@ void ptrArrayDelete(struct ptrArray *p, uintmax_t i)
if (i >= p->len) if (i >= p->len)
complain("index out of range in ptrArrayRemove()"); complain("index out of range in ptrArrayRemove()");
for (j = i; j < p->len - 1; j++) // thanks to ValleyBell
p->ptrs[j] = p->ptrs[j + 1]; memmove(&(p->ptrs[i]), &(p->ptrs[i + 1]), (p->len - i - 1) * sizeof (void *));
p->ptrs[j] = NULL; p->ptrs[p->len - 1] = NULL;
p->len--; p->len--;
} }

1
uipriv.h
View File

@ -26,3 +26,4 @@ void ptrArrayDestroy(struct ptrArray *);
void ptrArrayAppend(struct ptrArray *, void *); void ptrArrayAppend(struct ptrArray *, void *);
void ptrArrayInsertBefore(struct ptrArray *, uintmax_t, void *); void ptrArrayInsertBefore(struct ptrArray *, uintmax_t, void *);
void ptrArrayDelete(struct ptrArray *, uintmax_t); void ptrArrayDelete(struct ptrArray *, uintmax_t);
#define ptrArrayIndex(p, T, i) ((T) ((p)->ptrs[(i)]))