2019-05-20 12:45:58 +00:00
committed by Git OBS Bridge
parent e411099a0c
commit db530a2969

View File

@@ -1043,10 +1043,11 @@
+++ texk/web2c/luatexdir/luapplib/ppheap.c 2019-05-20 12:04:35.067508800 +0000
@@ -101,21 +101,25 @@
#endif
typedef struct _simplereg {
typedef struct _simplereg {
- size_t bucket_pos;
+ int heap_instance;
int bucket_pos;
+ int bucket_pos;
size_t bucket_size;
- size_t heap_instance;
- aligned_data **align_data_set ;
@@ -1084,7 +1085,7 @@
}
@@ -134,37 +138,40 @@
align_set->bucket_pos = 0;
align_set->bucket_size = ALIGN_BUFF_BUCKET_SIZE;
align_set->bucket_size = ALIGN_BUFF_BUCKET_SIZE;
align_set->heap_instance = 1;
- memset(align_set->align_data_set, 0UL,size);
+ memset(align_set->align_data._area, 0, size);
@@ -1132,19 +1133,18 @@
align_set->bucket_pos++;
-
}
static void align_free_set(void){
@@ -174,15 +181,16 @@
if (align_set->heap_instance>1) {
align_set->heap_instance--;
} else if (align_set->heap_instance ==1) {
} else if (align_set->heap_instance ==1) {
- if (align_set->align_data_set){
- int p;
- for(p=1;p<align_set->bucket_pos;p++){
- aligned_data *ptr = align_set->align_data_set[p];
- size_t p;
- for(p=1;p<align_set->bucket_pos;p++){
- if (align_set->align_data_set[p]) {
- free(align_set->align_data_set[p]);
+ if (align_set->align_data._area){
+ if (align_set->align_data._area){
+ int p = align_set->bucket_pos;
+ while (p-- > 0){
+ if (align_set->align_data._set[p]) {
@@ -1157,7 +1157,7 @@
+ free(align_set->align_data._area);
+ align_set->align_data._area = NULL;
}
align_set->heap_instance=0;
align_set->heap_instance=0;
free(align_set);
@@ -225,7 +233,6 @@
#ifdef PPHEAP_NEED_ALIGNMENT
@@ -1165,7 +1165,7 @@
#endif
-
}
void ppheap_renew (ppheap *heap)
@@ -415,7 +422,7 @@
// iof_close(O);