pike.git/
src/
array.c
Branch:
Tag:
Non-build tags
All tags
No tags
2014-09-03
2014-09-03 18:59:35 by Martin Nilsson <nilsson@opera.com>
6ff8251b6110adaa50c096079fa886eb7f36e9b3 (
15
lines) (+
6
/-
9
)
[
Show
|
Annotate
]
Branch:
8.0
Don't cast memmove void* arguments.
399:
if ((v->item != v->real_item) && (((index<<1) < v->size) || ((v->item + v->size) == (v->real_item + v->malloced_size)))) {
-
memmove(
(char *)(
ITEM(v)-1
)
,
-
(char *)(
ITEM(v)
)
,
-
index * sizeof(struct svalue));
+
memmove(ITEM(v)-1, ITEM(v), index * sizeof(struct svalue));
v->item--; } else {
-
memmove(
(char *)(
ITEM(v)+index+1
)
,
-
(char *)(
ITEM(v)+index
)
,
+
memmove(ITEM(v)+index+1, ITEM(v)+index,
(v->size-index) * sizeof(struct svalue)); } assert_free_svalue (ITEM(v) + index);
649:
} else { if(v->size-index>1) {
-
memmove(
(char *)(
ITEM(v)+index
)
,
-
(char *)(
ITEM(v)+index+1
)
,
+
memmove(ITEM(v)+index, ITEM(v)+index+1,
(v->size-index-1)*sizeof(struct svalue)); } v->size--;
1700:
Inside #if 1
if (v2) { debug_malloc_touch(v2); mark_free_svalue(argp + e2);
-
memmove(
(char *)(
v2->real_item + tmp2
)
,
(char *)
ITEM(v2),
+
memmove(v2->real_item + tmp2, ITEM(v2),
v2->size * sizeof(struct svalue)); v2->item = v2->real_item + tmp2; for(tmp=e2-1;tmp>=0;tmp--)