pike.git/
src/
array.c
Branch:
Tag:
Non-build tags
All tags
No tags
2014-04-27
2014-04-27 18:31:29 by Martin Nilsson <nilsson@opera.com>
0ec752ef450dbf541fd9c208bd4e388e4a5efc1c (
23
lines) (+
12
/-
11
)
[
Show
|
Annotate
]
Branch:
8.0
Free takes void* and doesn't need any cast anymore.
133:
{ DOUBLEUNLINK (first_array, v);
-
free(
(char *)
v);
+
free(v);
GC_FREE(v); }
1882:
ordera, orderb ); ret=array_zip(tmpa,tmpb,zipper);
-
UNSET_ONERROR(r3); free(
(char *)
zipper);
+
UNSET_ONERROR(r3); free(zipper);
UNSET_ONERROR(r2); free_array(tmpb); UNSET_ONERROR(r1); free_array(tmpa);
-
UNSET_ONERROR(r5); free(
(char *)
orderb);
-
UNSET_ONERROR(r4); free(
(char *)
ordera);
+
UNSET_ONERROR(r5); free(orderb);
+
UNSET_ONERROR(r4); free(ordera);
return ret; }
1974:
if(arrb != ITEM(b)) { UNSET_ONERROR(r4);
-
free(
(char *)
arrb);
+
free(arrb);
} if(arra != ITEM(a)) { UNSET_ONERROR(r3);
-
free(
(char *)
arra);
+
free(arra);
} UNSET_ONERROR(r2);
2007:
Inside #if 0
INT32 *zipper; struct array *tmpa,*tmpb,*ret;
-
if(ordera) { free(
(char *)
ordera); ordera=0; }
-
if(orderb) { free(
(char *)
orderb); orderb=0; }
+
if(ordera) { free(ordera); ordera=0; }
+
if(orderb) { free(orderb); orderb=0; }
ordera=get_set_order(a); tmpa=reorder_and_copy_array(a,ordera);
-
free(
(char *)
ordera);
+
free(ordera);
ordera=0; orderb=get_set_order(b); tmpb=reorder_and_copy_array(b,orderb);
-
free(
(char *)
orderb);
+
free(orderb);
orderb=0; zipper=merge(tmpa,tmpb,op); ret=array_zip(tmpa,tmpb,zipper); free_array(tmpa); free_array(tmpb);
-
free(
(char *)
zipper);
+
free(zipper);
return ret; #else