projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
parser: decl blacklist
[m6w6/ext-psi]
/
src
/
plist.c
diff --git
a/src/plist.c
b/src/plist.c
index 2cf4eb3674e509378eba5312ff7d7cf2b46851d7..25f6676ca9a2c110f6bb5a0800f2f59c81901d69 100644
(file)
--- a/
src/plist.c
+++ b/
src/plist.c
@@
-44,10
+44,10
@@
struct psi_plist {
} while (0)
/* !!! adjust list->count prior reduction */
#define PLIST_MOV_REDUCE(l, i) PLIST_MOV_REDUCE_EX(l, i, 1)
} while (0)
/* !!! adjust list->count prior reduction */
#define PLIST_MOV_REDUCE(l, i) PLIST_MOV_REDUCE_EX(l, i, 1)
-#define PLIST_MOV_REDUCE_EX(l, i, n) memmove(PLIST_ELE(l, i), PLIST_ELE(l,
i + n), (l)->size * ((l)->count - i
))
+#define PLIST_MOV_REDUCE_EX(l, i, n) memmove(PLIST_ELE(l, i), PLIST_ELE(l,
(i) + (n)), (l)->size * ((l)->count - (i)
))
/* !!! adjust list->count after expansion */
#define PLIST_MOV_EXPAND(l, i) PLIST_MOV_EXPAND_EX(l, i, 1)
/* !!! adjust list->count after expansion */
#define PLIST_MOV_EXPAND(l, i) PLIST_MOV_EXPAND_EX(l, i, 1)
-#define PLIST_MOV_EXPAND_EX(l, i, n) memmove(PLIST_ELE(l,
i + n), PLIST_ELE(l, i), (l)->size * ((l)->count - i
))
+#define PLIST_MOV_EXPAND_EX(l, i, n) memmove(PLIST_ELE(l,
(i) + (n)), PLIST_ELE(l, i), (l)->size * ((l)->count - (i)
))
struct psi_plist *psi_plist_init(void (*dtor)(void *)) {
return psi_plist_init_ex(0, dtor);
struct psi_plist *psi_plist_init(void (*dtor)(void *)) {
return psi_plist_init_ex(0, dtor);
@@
-192,7
+192,7
@@
struct psi_plist *psi_plist_ins_r(struct psi_plist *list, size_t offset_start, s
size_t new_count;
if (list) {
size_t new_count;
if (list) {
- new_count = MAX(offset_start
+ 1
, list->count) + num_eles;
+ new_count = MAX(offset_start, list->count) + num_eles;
if (new_count) {
list = realloc(list, sizeof(*list) + list->size + new_count * list->size);
}
if (new_count) {
list = realloc(list, sizeof(*list) + list->size + new_count * list->size);
}