core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-965: clean up

This commit is contained in:
Shahram Najm 2019-08-01 17:44:00 +01:00
parent f26d628e64
commit aa6ff711a9
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/grib_accessor_class_bufr_data_array.c
View File

@ -436,9 +436,7 @@ static int check_end_data(grib_context* c,grib_accessor_bufr_data_array* self,in
static void self_clear(grib_context* c,grib_accessor_bufr_data_array* self)
{
grib_context_free(c,self->canBeMissing);
//printf("zzzz grib_vdarray_delete_content self->numericValues...start\n");
grib_vdarray_delete_content(c,self->numericValues);
//printf("zzzz grib_vdarray_delete_content self->numericValues...end\n");
grib_vdarray_delete(c,self->numericValues);
if(self->stringValues) {
grib_vsarray_delete_content(c,self->stringValues);
@ -1081,7 +1079,6 @@ static int decode_element(grib_context* c,grib_accessor_bufr_data_array* self,in
}
if (self->compressedData) {
dar=decode_double_array(c,data,pos,bd,self->canBeMissing[i],self,&err);
//printf("zzzz placing dar=%p into numericValues\n", (void*)dar);
grib_vdarray_push(c,self->numericValues,dar);
} else {
/* Uncompressed */
@ -2661,9 +2658,7 @@ static int process_elements(grib_accessor* a,int flag,long onlySubset,long start
descriptors=self->expanded->v;
if (do_clean==1 && self->numericValues) {
//printf("zzzz grib_vdarray_delete_content self->numericValues...start\n");
grib_vdarray_delete_content(c,self->numericValues);
//printf("zzzz grib_vdarray_delete_content self->numericValues...end\n");
grib_vdarray_delete(c,self->numericValues);
grib_vsarray_delete_content(c,self->stringValues);
grib_vsarray_delete(c,self->stringValues);
@ -2671,7 +2666,6 @@ static int process_elements(grib_accessor* a,int flag,long onlySubset,long start
if (flag!=PROCESS_ENCODE) {
self->numericValues=grib_vdarray_new(c,1000,1000);
//printf("xxxx self->numericValues=%p\n", (void*)self->numericValues);
self->stringValues=grib_vsarray_new(c,10,10);
if (self->elementsDescriptorsIndex) grib_viarray_delete(c,self->elementsDescriptorsIndex);

6
src/grib_vdarray.c
View File

@ -74,10 +74,7 @@ grib_vdarray* grib_vdarray_push(grib_context* c,grib_vdarray* v,grib_darray* val
size_t start_incsize=100;
if (!v) v=grib_vdarray_new(c,start_size,start_incsize);
if (v->n >= v->size) {
//printf("yyyy resize array %p (v->n=%ld v->size=%ld)\n", (void*)v, v->n, v->size);
v=grib_vdarray_resize(c,v);
}
if (v->n >= v->size) v=grib_vdarray_resize(c,v);
v->v[v->n]=val;
v->n++;
return v;
@ -97,7 +94,6 @@ void grib_vdarray_delete_content(grib_context* c,grib_vdarray* v)
if (!v || !v->v) return;
if (!c) grib_context_get_default();
for (i=0;i<v->n;i++) {
//printf("zzzz grib_darray_delete %p\n", (void*)v->v[i]);
grib_darray_delete(c,v->v[i]);
v->v[i]=0;
}