diff --git a/src/grib_handle.c b/src/grib_handle.c
index cbf1ae98b..0031a3aa5 100644
--- a/src/grib_handle.c
+++ b/src/grib_handle.c
@@ -45,210 +45,209 @@ static grib_handle* grib_handle_new_multi ( grib_context* c,unsigned char** idat
 
 grib_section* grib_section_create ( grib_handle* h,grib_accessor* owner )
 {
-	grib_section* s = ( grib_section* ) grib_context_malloc_clear ( h->context,sizeof ( grib_section ) );
-	s->owner       = owner;
-	s->aclength   = NULL;
-	s->h          = h;
-	s->block      = ( grib_block_of_accessors* ) grib_context_malloc_clear ( h->context, sizeof ( grib_block_of_accessors ) );
-	return s;
+    grib_section* s = ( grib_section* ) grib_context_malloc_clear ( h->context,sizeof ( grib_section ) );
+    s->owner       = owner;
+    s->aclength   = NULL;
+    s->h          = h;
+    s->block      = ( grib_block_of_accessors* ) grib_context_malloc_clear ( h->context, sizeof ( grib_block_of_accessors ) );
+    return s;
 }
 
 static void update_sections ( grib_section *s,grib_handle* h,long offset )
 {
-	grib_accessor *a = s?s->block->first:NULL;
-	if ( s ) s->h = h;
-	while ( a )
-	{
-		a->offset += offset;
-		/* update_sections ( grib_get_sub_section ( a ),h,offset ); */
-		update_sections ( a->sub_section,h,offset );
-		a = a->next;
-	}
+    grib_accessor *a = s?s->block->first:NULL;
+    if ( s ) s->h = h;
+    while ( a )
+    {
+        a->offset += offset;
+        /* update_sections ( grib_get_sub_section ( a ),h,offset ); */
+        update_sections ( a->sub_section,h,offset );
+        a = a->next;
+    }
 }
 
 void grib_swap_sections ( grib_section* the_old, grib_section *the_new )
 {
-	grib_accessor* a;
-	grib_block_of_accessors* b = the_old->block;
+    grib_accessor* a;
+    grib_block_of_accessors* b = the_old->block;
 
-	/* printf("SWAPPING -----\n"); grib_dump_section_content(new,stdout); */
-	the_old->block = the_new->block;
-	the_new->block = b;
+    /* printf("SWAPPING -----\n"); grib_dump_section_content(new,stdout); */
+    the_old->block = the_new->block;
+    the_new->block = b;
 
-	a = the_old->aclength;
-	the_old->aclength = the_new->aclength;
-	the_new->aclength = a;
+    a = the_old->aclength;
+    the_old->aclength = the_new->aclength;
+    the_new->aclength = a;
 
-	a = the_old->block->first;
-	while ( a )
-	{
-		a->parent = the_old;
-		a = a->next;
-	}
+    a = the_old->block->first;
+    while ( a )
+    {
+        a->parent = the_old;
+        a = a->next;
+    }
 
-	update_sections ( the_old, the_old->h, the_old->owner->offset );
-	/* update_sections(new,new->h,new->owner->offset); */
+    update_sections ( the_old, the_old->h, the_old->owner->offset );
+    /* update_sections(new,new->h,new->owner->offset); */
 
-	/* printf("SWAPPING -----\n"); grib_dump_section_content(old,stdout); */
+    /* printf("SWAPPING -----\n"); grib_dump_section_content(old,stdout); */
 
 }
 
 void grib_empty_section ( grib_context   *c,grib_section* b )
 {
-	grib_accessor* current = NULL;
-	if ( !b ) return;
+    grib_accessor* current = NULL;
+    if ( !b ) return;
 
-	b->aclength = NULL;
+    b->aclength = NULL;
 
-	current = b->block->first;
+    current = b->block->first;
 
-	while ( current )
-	{
-		grib_accessor* next = current->next;
-		if (current->sub_section) {
-			grib_section_delete(c,current->sub_section);
-			current->sub_section=0;
-		}
-		grib_accessor_delete ( c,current );
-		current = next;
-	}
-	b->block->first = b->block->last = 0;
+    while ( current )
+    {
+        grib_accessor* next = current->next;
+        if (current->sub_section) {
+            grib_section_delete(c,current->sub_section);
+            current->sub_section=0;
+        }
+        grib_accessor_delete ( c,current );
+        current = next;
+    }
+    b->block->first = b->block->last = 0;
 
 }
 
 void grib_section_delete ( grib_context   *c, grib_section* b )
 {
-	if ( !b ) return;
+    if ( !b ) return;
 
-	grib_empty_section ( c,b );
-	grib_context_free ( c,b->block );
-	grib_context_free ( c,b );
+    grib_empty_section ( c,b );
+    grib_context_free ( c,b->block );
+    grib_context_free ( c,b );
 }
 
 int grib_handle_delete ( grib_handle* h )
 {
-	if ( h != NULL )
-	{
-		grib_context   *ct =h->context;
-		grib_dependency *d = h->dependencies;
-		grib_dependency *n;
+    if ( h != NULL )
+    {
+        grib_context   *ct =h->context;
+        grib_dependency *d = h->dependencies;
+        grib_dependency *n;
 
-		Assert ( h->kid == NULL );
+        Assert ( h->kid == NULL );
 
-		while ( d )
-		{
-			n = d->next;
-			grib_context_free ( ct,d );
-			d = n;
-		}
-		h->dependencies=0;
+        while ( d )
+        {
+            n = d->next;
+            grib_context_free ( ct,d );
+            d = n;
+        }
+        h->dependencies=0;
 
-		grib_buffer_delete ( ct,h->buffer );
-		grib_section_delete ( ct,h->root );
+        grib_buffer_delete ( ct,h->buffer );
+        grib_section_delete ( ct,h->root );
 
-		grib_context_log ( ct,GRIB_LOG_DEBUG,"grib_handle_delete: deleting handle %p",h );
-		grib_context_free ( ct,h );
-		h=NULL;
-	}
-	return GRIB_SUCCESS;
+        grib_context_log ( ct,GRIB_LOG_DEBUG,"grib_handle_delete: deleting handle %p",h );
+        grib_context_free ( ct,h );
+        h=NULL;
+    }
+    return GRIB_SUCCESS;
 }
 
 grib_handle* grib_new_handle ( grib_context* c )
 {
-	grib_handle    *g = NULL;
-	if ( c == NULL ) c = grib_context_get_default();
-	g = ( grib_handle* ) grib_context_malloc_clear ( c,sizeof ( grib_handle ) );
+    grib_handle    *g = NULL;
+    if ( c == NULL ) c = grib_context_get_default();
+    g = ( grib_handle* ) grib_context_malloc_clear ( c,sizeof ( grib_handle ) );
 
 
-	if ( g == NULL ) {
-		grib_context_log ( c,GRIB_LOG_ERROR,"grib_new_handle: cannot allocate handle" );
-	} else {
-		g->context = c;
-	}
+    if ( g == NULL ) {
+        grib_context_log ( c,GRIB_LOG_ERROR,"grib_new_handle: cannot allocate handle" );
+    } else {
+        g->context = c;
+    }
 
-	grib_context_log ( c,GRIB_LOG_DEBUG,"grib_new_handle: allocated handle %p",g );
+    grib_context_log ( c,GRIB_LOG_DEBUG,"grib_new_handle: allocated handle %p",g );
 
-	return g;
+    return g;
 }
 
 static grib_handle* grib_handle_create ( grib_handle  *gl, grib_context* c,void* data, size_t buflen )
 {
-	grib_action* next = NULL;
-	int err = 0;
+    grib_action* next = NULL;
+    int err = 0;
 
-	if ( gl == NULL )
-		return NULL;
+    if ( gl == NULL )
+        return NULL;
 
-	gl->use_trie = 1;
-	gl->trie_invalid=0;
-	gl->buffer = grib_new_buffer ( gl->context,(unsigned char*)data,buflen );
+    gl->use_trie = 1;
+    gl->trie_invalid=0;
+    gl->buffer = grib_new_buffer ( gl->context,(unsigned char*)data,buflen );
 
-	if ( gl->buffer == NULL )
-	{
-		grib_handle_delete ( gl );
-		return NULL;
-	}
+    if ( gl->buffer == NULL )
+    {
+        grib_handle_delete ( gl );
+        return NULL;
+    }
 
-	gl->root     = grib_create_root_section ( gl->context,gl );
+    gl->root     = grib_create_root_section ( gl->context,gl );
 
-	if ( !gl->root )
-	{
-		grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_message: cannot create root section" );
-		grib_handle_delete ( gl );
-		return NULL;
-	}
+    if ( !gl->root )
+    {
+        grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_message: cannot create root section" );
+        grib_handle_delete ( gl );
+        return NULL;
+    }
 
-	if ( !gl->context->grib_reader || !gl->context->grib_reader->first )
-	{
-		grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_message: cannot create handle, no definitions found" );
-		grib_handle_delete ( gl );
-		return NULL;
-	}
+    if ( !gl->context->grib_reader || !gl->context->grib_reader->first )
+    {
+        grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_message: cannot create handle, no definitions found" );
+        grib_handle_delete ( gl );
+        return NULL;
+    }
 
-	gl->buffer->property = GRIB_USER_BUFFER;
+    gl->buffer->property = GRIB_USER_BUFFER;
 
-	next = gl->context->grib_reader->first->root;
-	while ( next )
-	{
-		if ( grib_create_accessor ( gl->root, next, NULL ) != GRIB_SUCCESS )
-			break;
-		next = next->next;
-	}
+    next = gl->context->grib_reader->first->root;
+    while ( next )
+    {
+        if ( grib_create_accessor ( gl->root, next, NULL ) != GRIB_SUCCESS )
+            break;
+        next = next->next;
+    }
 
-	err = grib_section_adjust_sizes ( gl->root,0,0 );
-	if (err)
-	{
-		grib_handle_delete ( gl );
-		return NULL;
-	}
+    err = grib_section_adjust_sizes ( gl->root,0,0 );
+    if (err)
+    {
+        grib_handle_delete ( gl );
+        return NULL;
+    }
 
-	grib_section_post_init ( gl->root );
-
-	return gl;
+    grib_section_post_init ( gl->root );
 
+    return gl;
 }
 
 grib_handle* grib_handle_new_from_samples ( grib_context* c, const char* name )
 {
-	grib_handle* g = 0;
-	if ( c == NULL ) c = grib_context_get_default();
-	c->handle_file_count=0;
-	c->handle_total_count=0;
+    grib_handle* g = 0;
+    if ( c == NULL ) c = grib_context_get_default();
+    c->handle_file_count=0;
+    c->handle_total_count=0;
 
-	/*
+    /*
 	   g = grib_internal_template(c,name);
 	   if(g) return g;
-	 */
-	if (c->debug==-1) {
-		printf("GRIB_API DEBUG: grib_handle_new_from_samples '%s'\n", name);
-	}
+     */
+    if (c->debug) {
+        printf("GRIB_API DEBUG: grib_handle_new_from_samples '%s'\n", name);
+    }
 
-	g=grib_external_template ( c,name );
-	if ( !g )
-		grib_context_log ( c,GRIB_LOG_ERROR,"Unable to load sample file %s.tmpl\n                    in %s",
-				name, c->grib_samples_path );
+    g=grib_external_template ( c,name );
+    if ( !g )
+        grib_context_log ( c,GRIB_LOG_ERROR,"Unable to load sample file %s.tmpl\n                    in %s",
+                name, c->grib_samples_path );
 
-	return g;
+    return g;
 }
 
 int grib_write_message(grib_handle* h,const char* file,const char* mode)
@@ -282,7 +281,7 @@ int grib_write_message(grib_handle* h,const char* file,const char* mode)
 
 grib_handle* grib_handle_clone ( grib_handle* h )
 {
-	return grib_handle_new_from_message_copy ( h->context, h->buffer->data, h->buffer->ulength );
+    return grib_handle_new_from_message_copy ( h->context, h->buffer->data, h->buffer->ulength );
 }
 
 grib_handle* codes_handle_new_from_file(grib_context* c, FILE* f, ProductKind product, int* error)
@@ -321,558 +320,558 @@ grib_handle* codes_gts_handle_new_from_file(grib_context* c, FILE* f, int* error
 
 grib_handle* grib_handle_new_from_message_copy ( grib_context* c, const void* data, size_t size )
 {
-	grib_handle *g = NULL;
-	void* copy =NULL;
-	if ( c == NULL ) c = grib_context_get_default();
+    grib_handle *g = NULL;
+    void* copy =NULL;
+    if ( c == NULL ) c = grib_context_get_default();
 
-	c->handle_file_count=0;
-	c->handle_total_count=0;
-	copy = grib_context_malloc ( c,size );
-	if ( !copy ) {
-		return NULL;
-	}
+    c->handle_file_count=0;
+    c->handle_total_count=0;
+    copy = grib_context_malloc ( c,size );
+    if ( !copy ) {
+        return NULL;
+    }
 
-	memcpy ( copy,data,size );
+    memcpy ( copy,data,size );
 
-	g = grib_handle_new_from_message ( c,copy, size );
-	g->buffer->property = GRIB_MY_BUFFER;
+    g = grib_handle_new_from_message ( c,copy, size );
+    g->buffer->property = GRIB_MY_BUFFER;
 
-	return g;
+    return g;
 }
 
 grib_handle* grib_handle_new_from_partial_message_copy ( grib_context* c, const void* data, size_t size )
 {
-	grib_handle *g = NULL;
-	void* copy =NULL;
-	if ( c == NULL ) c = grib_context_get_default();
-	c->handle_file_count=0;
-	c->handle_total_count=0;
-	copy = grib_context_malloc ( c,size );
-	if ( !copy )
-		return NULL;
+    grib_handle *g = NULL;
+    void* copy =NULL;
+    if ( c == NULL ) c = grib_context_get_default();
+    c->handle_file_count=0;
+    c->handle_total_count=0;
+    copy = grib_context_malloc ( c,size );
+    if ( !copy )
+        return NULL;
 
-	memcpy ( copy,data,size );
+    memcpy ( copy,data,size );
 
-	g = grib_handle_new_from_partial_message ( c,copy, size );
-	g->buffer->property = GRIB_MY_BUFFER;
+    g = grib_handle_new_from_partial_message ( c,copy, size );
+    g->buffer->property = GRIB_MY_BUFFER;
 
-	return g;
+    return g;
 }
 
 grib_handle* grib_handle_new_from_partial_message ( grib_context* c,void* data, size_t buflen )
 {
-	grib_handle  *gl = NULL;
-	if ( c == NULL ) c = grib_context_get_default();
-	c->handle_file_count=0;
-	c->handle_total_count=0;
-	gl = grib_new_handle ( c );
-	gl->partial = 1;
-	return grib_handle_create ( gl,  c, data,  buflen );
+    grib_handle  *gl = NULL;
+    if ( c == NULL ) c = grib_context_get_default();
+    c->handle_file_count=0;
+    c->handle_total_count=0;
+    gl = grib_new_handle ( c );
+    gl->partial = 1;
+    return grib_handle_create ( gl,  c, data,  buflen );
 }
 
 grib_handle* grib_handle_new_from_message ( grib_context* c,void* data, size_t buflen )
 {
-	grib_handle  *gl = NULL;
-	grib_handle  *h = NULL;
-	if ( c == NULL ) c = grib_context_get_default();
-	gl = grib_new_handle ( c );
-	h=grib_handle_create ( gl,  c, data,  buflen );
-	return h;
+    grib_handle  *gl = NULL;
+    grib_handle  *h = NULL;
+    if ( c == NULL ) c = grib_context_get_default();
+    gl = grib_new_handle ( c );
+    h=grib_handle_create ( gl,  c, data,  buflen );
+    return h;
 }
 
 
 
 grib_handle* grib_handle_new_from_multi_message ( grib_context* c,void** data,
-		size_t *buflen,int* error )
+        size_t *buflen,int* error )
 {
-	grib_handle  *h = NULL;
-	unsigned char** d= ( unsigned char** ) data;
-	if ( c == NULL ) c = grib_context_get_default();
+    grib_handle  *h = NULL;
+    unsigned char** d= ( unsigned char** ) data;
+    if ( c == NULL ) c = grib_context_get_default();
 
-	if ( c->multi_support_on ) h=grib_handle_new_multi ( c,d,  buflen,error );
-	else
-	{
-		size_t olen=0;
-		void * message=NULL;
-		*error = grib_read_any_from_memory_alloc ( c, d,buflen,&message, &olen );
-		if ( message==NULL ) return NULL;
-		h = grib_new_handle ( c );
-		grib_handle_create ( h,  c, message,  olen );
-	}
+    if ( c->multi_support_on ) h=grib_handle_new_multi ( c,d,  buflen,error );
+    else
+    {
+        size_t olen=0;
+        void * message=NULL;
+        *error = grib_read_any_from_memory_alloc ( c, d,buflen,&message, &olen );
+        if ( message==NULL ) return NULL;
+        h = grib_new_handle ( c );
+        grib_handle_create ( h,  c, message,  olen );
+    }
 
-	return h;
+    return h;
 }
 
 grib_handle* grib_handle_new_from_file ( grib_context* c, FILE* f,int *error )
 {
-	return grib_new_from_file(c,f,0,error);
+    return grib_new_from_file(c,f,0,error);
 }
 
 static grib_handle* grib_handle_new_multi ( grib_context* c,unsigned char** data,
-		size_t *buflen,int* error )
+        size_t *buflen,int* error )
 {
-	void * message=NULL;
-	size_t olen = 0,len=0;
-	grib_handle  *gl = NULL;
-	long edition=0;
-	size_t seclen=0;
-	unsigned char* secbegin=0;
-	int secnum=0,seccount=0;
-	int err=0,i=0;
-	grib_multi_support* gm=NULL;
+    void * message=NULL;
+    size_t olen = 0,len=0;
+    grib_handle  *gl = NULL;
+    long edition=0;
+    size_t seclen=0;
+    unsigned char* secbegin=0;
+    int secnum=0,seccount=0;
+    int err=0,i=0;
+    grib_multi_support* gm=NULL;
 
-	if ( c == NULL ) c = grib_context_get_default();
+    if ( c == NULL ) c = grib_context_get_default();
 
-	gm=grib_get_multi_support ( c,0 );
+    gm=grib_get_multi_support ( c,0 );
 
-	if ( !gm->message )
-	{
-		*error = grib_read_any_from_memory_alloc ( c, data,buflen,&message, &olen );
-		gm->message_length=olen;
-		gm->message=(unsigned char*)message;
-		if ( *error != GRIB_SUCCESS || !message )
-		{
-			if ( *error == GRIB_END_OF_FILE ) *error = GRIB_SUCCESS;
-			gm->message_length = 0;
-			return NULL;
-		}
-	}
-	else
-	{
-		message=gm->message;
-	}
+    if ( !gm->message )
+    {
+        *error = grib_read_any_from_memory_alloc ( c, data,buflen,&message, &olen );
+        gm->message_length=olen;
+        gm->message=(unsigned char*)message;
+        if ( *error != GRIB_SUCCESS || !message )
+        {
+            if ( *error == GRIB_END_OF_FILE ) *error = GRIB_SUCCESS;
+            gm->message_length = 0;
+            return NULL;
+        }
+    }
+    else
+    {
+        message=gm->message;
+    }
 
-	edition=grib_decode_unsigned_byte_long ( (const unsigned char*)message,7,1 );
+    edition=grib_decode_unsigned_byte_long ( (const unsigned char*)message,7,1 );
 
-	if ( edition == 2 )
-	{
-		olen=gm->message_length;
-		if ( gm->section_number == 0 )
-		{
-			gm->sections[0]=(unsigned char*)message;
-		}
-		secbegin=gm->sections[gm->section_number];
-		seclen=gm->sections_length[gm->section_number];
-		secnum=gm->section_number;
-		seccount=0;
-		while ( grib2_get_next_section ( (unsigned char*)message,olen,&secbegin,&seclen,&secnum,&err ) )
-		{
-			seccount++;
-			/*printf("   - %d - section %d length=%d\n",(int)seccount,(int)secnum,(int)seclen);*/
+    if ( edition == 2 )
+    {
+        olen=gm->message_length;
+        if ( gm->section_number == 0 )
+        {
+            gm->sections[0]=(unsigned char*)message;
+        }
+        secbegin=gm->sections[gm->section_number];
+        seclen=gm->sections_length[gm->section_number];
+        secnum=gm->section_number;
+        seccount=0;
+        while ( grib2_get_next_section ( (unsigned char*)message,olen,&secbegin,&seclen,&secnum,&err ) )
+        {
+            seccount++;
+            /*printf("   - %d - section %d length=%d\n",(int)seccount,(int)secnum,(int)seclen);*/
 
-			gm->sections[secnum]=secbegin;
-			gm->sections_length[secnum]=seclen;
+            gm->sections[secnum]=secbegin;
+            gm->sections_length[secnum]=seclen;
 
-			if ( secnum == 6 )
-			{
-				/* Special case for inherited bitmaps */
-				if ( grib_decode_unsigned_byte_long ( secbegin,5,1 ) == 254 )
-				{
-					if ( !gm->bitmap_section )
-					{
-						grib_context_log ( gl->context, GRIB_LOG_ERROR,
-								"grib_handle_new_from_file : cannot create handle, missing bitmap\n" );
-						return NULL;
-					}
-					gm->sections[secnum]= gm->bitmap_section;
-					gm->sections_length[secnum]=gm->bitmap_section_length;
-				}
-				else
-				{
-					if ( gm->bitmap_section )
-					{
-						grib_context_free ( c,gm->bitmap_section );
-						gm->bitmap_section=NULL;
-					}
-					gm->bitmap_section = ( unsigned char* ) grib_context_malloc ( c,seclen );
-					gm->bitmap_section = (unsigned char*)memcpy ( gm->bitmap_section,secbegin,seclen );
-					gm->bitmap_section_length=seclen;
-				}
-			}
+            if ( secnum == 6 )
+            {
+                /* Special case for inherited bitmaps */
+                if ( grib_decode_unsigned_byte_long ( secbegin,5,1 ) == 254 )
+                {
+                    if ( !gm->bitmap_section )
+                    {
+                        grib_context_log ( gl->context, GRIB_LOG_ERROR,
+                                "grib_handle_new_from_file : cannot create handle, missing bitmap\n" );
+                        return NULL;
+                    }
+                    gm->sections[secnum]= gm->bitmap_section;
+                    gm->sections_length[secnum]=gm->bitmap_section_length;
+                }
+                else
+                {
+                    if ( gm->bitmap_section )
+                    {
+                        grib_context_free ( c,gm->bitmap_section );
+                        gm->bitmap_section=NULL;
+                    }
+                    gm->bitmap_section = ( unsigned char* ) grib_context_malloc ( c,seclen );
+                    gm->bitmap_section = (unsigned char*)memcpy ( gm->bitmap_section,secbegin,seclen );
+                    gm->bitmap_section_length=seclen;
+                }
+            }
 
-			if ( secnum == 7 )
-			{
-				void* p=message;
-				len=olen;
-				grib2_build_message ( c,gm->sections,gm->sections_length,&message,&len );
+            if ( secnum == 7 )
+            {
+                void* p=message;
+                len=olen;
+                grib2_build_message ( c,gm->sections,gm->sections_length,&message,&len );
 
-				if ( grib2_has_next_section ( (unsigned char*)p,olen,secbegin,seclen,&err ) )
-				{
-					gm->message=(unsigned char*)p;
-					gm->section_number=secnum;
-					olen=len;
-				}
-				else
-				{
-					grib_context_free ( c,gm->message );
-					gm->message=NULL;
-					for ( i=0;i<8;i++ ) gm->sections[i]=NULL;
-					gm->section_number=0;
-					gm->message_length=0;
-					olen=len;
-				}
+                if ( grib2_has_next_section ( (unsigned char*)p,olen,secbegin,seclen,&err ) )
+                {
+                    gm->message=(unsigned char*)p;
+                    gm->section_number=secnum;
+                    olen=len;
+                }
+                else
+                {
+                    grib_context_free ( c,gm->message );
+                    gm->message=NULL;
+                    for ( i=0;i<8;i++ ) gm->sections[i]=NULL;
+                    gm->section_number=0;
+                    gm->message_length=0;
+                    olen=len;
+                }
 
-				break;
-			}
-		}
+                break;
+            }
+        }
 
-	}
-	else
-	{
-		gm->message_length=0;
-		gm->message=NULL;
-	}
+    }
+    else
+    {
+        gm->message_length=0;
+        gm->message=NULL;
+    }
 
-	gl = grib_handle_new_from_message ( c, message, olen );
-	if ( !gl )
-	{
-		*error = GRIB_DECODING_ERROR;
-		grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle \n" );
-		return NULL;
-	}
+    gl = grib_handle_new_from_message ( c, message, olen );
+    if ( !gl )
+    {
+        *error = GRIB_DECODING_ERROR;
+        grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle \n" );
+        return NULL;
+    }
 
-	gl->buffer->property = GRIB_MY_BUFFER;
-	c->handle_file_count++;
-	c->handle_total_count++;
+    gl->buffer->property = GRIB_MY_BUFFER;
+    c->handle_file_count++;
+    c->handle_total_count++;
 
-	return gl;
+    return gl;
 }
 
 static grib_handle* grib_handle_new_from_file_multi ( grib_context* c, FILE* f,int *error )
 {
-	void* data = NULL,*old_data=NULL;
-	size_t olen = 0,len=0;
-	grib_handle  *gl = NULL;
-	long edition=0;
-	size_t seclen=0;
-	unsigned char* secbegin=0;
-	int secnum=0,seccount=0;
-	int err=0,i=0;
-	grib_multi_support* gm=NULL;
-	off_t gts_header_offset=0;
-	off_t end_msg_offset=0,offset=0;
-	char *gts_header=0,*save_gts_header=0;
-	int gtslen=0;
+    void* data = NULL,*old_data=NULL;
+    size_t olen = 0,len=0;
+    grib_handle  *gl = NULL;
+    long edition=0;
+    size_t seclen=0;
+    unsigned char* secbegin=0;
+    int secnum=0,seccount=0;
+    int err=0,i=0;
+    grib_multi_support* gm=NULL;
+    off_t gts_header_offset=0;
+    off_t end_msg_offset=0,offset=0;
+    char *gts_header=0,*save_gts_header=0;
+    int gtslen=0;
 
-	if ( c == NULL ) c = grib_context_get_default();
+    if ( c == NULL ) c = grib_context_get_default();
 
-	gm=grib_get_multi_support ( c,f );
+    gm=grib_get_multi_support ( c,f );
 
-	if ( !gm->message )
-	{
-		gts_header_offset=grib_context_tell( c,f);
-		data = wmo_read_grib_from_file_malloc ( f,0, &olen,&offset,error );
-		end_msg_offset=grib_context_tell ( c,f );
+    if ( !gm->message )
+    {
+        gts_header_offset=grib_context_tell( c,f);
+        data = wmo_read_grib_from_file_malloc ( f,0, &olen,&offset,error );
+        end_msg_offset=grib_context_tell ( c,f );
 
-		gm->message_length=olen;
-		gm->message=(unsigned char*)data;
-		gm->offset=offset;
-		if ( *error != GRIB_SUCCESS || !data )
-		{
-			if ( data ) grib_context_free ( c,data );
+        gm->message_length=olen;
+        gm->message=(unsigned char*)data;
+        gm->offset=offset;
+        if ( *error != GRIB_SUCCESS || !data )
+        {
+            if ( data ) grib_context_free ( c,data );
 
-			if ( *error == GRIB_END_OF_FILE ) *error = GRIB_SUCCESS;
-			gm->message_length = 0;
-			gm->message=NULL;
-			return NULL;
-		}
-		if ( c->gts_header_on )
-		{
-			int g=0;
-			grib_context_seek ( c,gts_header_offset,SEEK_SET,f );
-			gtslen=offset-gts_header_offset;
-			gts_header=(char*)grib_context_malloc_clear ( c,sizeof ( unsigned char ) *gtslen );
-			save_gts_header=gts_header;
-			grib_context_read ( c,gts_header,gtslen,f );
-			g=gtslen;
-			while ( gts_header!=NULL && g != 0 && *gts_header != '\03' )
-			{
-				/*printf("--------%d %X \n",gtslen,*gts_header);*/
-				gts_header++;
-				g--;
-			}
-			if ( g>8 ) {gts_header++;gtslen=g-1;}
-			else gts_header=save_gts_header;
-			grib_context_seek ( c,end_msg_offset,SEEK_SET,f );
-		}
+            if ( *error == GRIB_END_OF_FILE ) *error = GRIB_SUCCESS;
+            gm->message_length = 0;
+            gm->message=NULL;
+            return NULL;
+        }
+        if ( c->gts_header_on )
+        {
+            int g=0;
+            grib_context_seek ( c,gts_header_offset,SEEK_SET,f );
+            gtslen=offset-gts_header_offset;
+            gts_header=(char*)grib_context_malloc_clear ( c,sizeof ( unsigned char ) *gtslen );
+            save_gts_header=gts_header;
+            grib_context_read ( c,gts_header,gtslen,f );
+            g=gtslen;
+            while ( gts_header!=NULL && g != 0 && *gts_header != '\03' )
+            {
+                /*printf("--------%d %X \n",gtslen,*gts_header);*/
+                gts_header++;
+                g--;
+            }
+            if ( g>8 ) {gts_header++;gtslen=g-1;}
+            else gts_header=save_gts_header;
+            grib_context_seek ( c,end_msg_offset,SEEK_SET,f );
+        }
 
-	}
-	else
-		data=gm->message;
+    }
+    else
+        data=gm->message;
 
-	edition=grib_decode_unsigned_byte_long ( (const unsigned char*)data,7,1 );
+    edition=grib_decode_unsigned_byte_long ( (const unsigned char*)data,7,1 );
 
-	if ( edition == 2 )
-	{
-		olen=gm->message_length;
-		if ( gm->section_number == 0 )
-		{
-			gm->sections[0]=(unsigned char*)data;
-		}
-		secbegin=gm->sections[gm->section_number];
-		seclen=gm->sections_length[gm->section_number];
-		secnum=gm->section_number;
-		seccount=0;
-		while ( grib2_get_next_section ( (unsigned char*)data,olen,&secbegin,&seclen,&secnum,&err ) )
-		{
-			seccount++;
-			/*printf("   - %d - section %d length=%d\n",(int)seccount,(int)secnum,(int)seclen);*/
+    if ( edition == 2 )
+    {
+        olen=gm->message_length;
+        if ( gm->section_number == 0 )
+        {
+            gm->sections[0]=(unsigned char*)data;
+        }
+        secbegin=gm->sections[gm->section_number];
+        seclen=gm->sections_length[gm->section_number];
+        secnum=gm->section_number;
+        seccount=0;
+        while ( grib2_get_next_section ( (unsigned char*)data,olen,&secbegin,&seclen,&secnum,&err ) )
+        {
+            seccount++;
+            /*printf("   - %d - section %d length=%d\n",(int)seccount,(int)secnum,(int)seclen);*/
 
-			gm->sections[secnum]=secbegin;
-			gm->sections_length[secnum]=seclen;
+            gm->sections[secnum]=secbegin;
+            gm->sections_length[secnum]=seclen;
 
-			if ( secnum == 6 )
-			{
-				/* Special case for inherited bitmaps */
-				if ( grib_decode_unsigned_byte_long ( secbegin,5,1 ) == 254 )
-				{
-					if ( !gm->bitmap_section )
-					{
-						grib_context_log ( gl->context, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle, missing bitmap\n" );
-						grib_context_free ( c,data );
-						return NULL;
-					}
-					gm->sections[secnum]= gm->bitmap_section;
-					gm->sections_length[secnum]=gm->bitmap_section_length;
-				}
-				else
-				{
-					if ( gm->bitmap_section )
-					{
-						grib_context_free ( c,gm->bitmap_section );
-						gm->bitmap_section=NULL;
-					}
-					gm->bitmap_section = ( unsigned char* ) grib_context_malloc ( c,seclen );
-					gm->bitmap_section = (unsigned char*)memcpy ( gm->bitmap_section,secbegin,seclen );
-					gm->bitmap_section_length=seclen;
-				}
-			}
+            if ( secnum == 6 )
+            {
+                /* Special case for inherited bitmaps */
+                if ( grib_decode_unsigned_byte_long ( secbegin,5,1 ) == 254 )
+                {
+                    if ( !gm->bitmap_section )
+                    {
+                        grib_context_log ( gl->context, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle, missing bitmap\n" );
+                        grib_context_free ( c,data );
+                        return NULL;
+                    }
+                    gm->sections[secnum]= gm->bitmap_section;
+                    gm->sections_length[secnum]=gm->bitmap_section_length;
+                }
+                else
+                {
+                    if ( gm->bitmap_section )
+                    {
+                        grib_context_free ( c,gm->bitmap_section );
+                        gm->bitmap_section=NULL;
+                    }
+                    gm->bitmap_section = ( unsigned char* ) grib_context_malloc ( c,seclen );
+                    gm->bitmap_section = (unsigned char*)memcpy ( gm->bitmap_section,secbegin,seclen );
+                    gm->bitmap_section_length=seclen;
+                }
+            }
 
-			if ( secnum == 7 )
-			{
-				old_data=data;
-				len=olen;
-				grib2_build_message ( c,gm->sections,gm->sections_length,&data,&len );
+            if ( secnum == 7 )
+            {
+                old_data=data;
+                len=olen;
+                grib2_build_message ( c,gm->sections,gm->sections_length,&data,&len );
 
-				if ( grib2_has_next_section ( (unsigned char*)old_data,olen,secbegin,seclen,&err ) )
-				{
-					gm->message=(unsigned char*)old_data;
-					gm->section_number=secnum;
-					olen=len;
-				}
-				else
-				{
-					if ( gm->message ) grib_context_free ( c,gm->message );
-					gm->message=NULL;
-					for ( i=0;i<8;i++ ) gm->sections[i]=NULL;
-					gm->section_number=0;
-					gm->message_length=0;
-					olen=len;
-				}
-				break;
-			}
-		}
+                if ( grib2_has_next_section ( (unsigned char*)old_data,olen,secbegin,seclen,&err ) )
+                {
+                    gm->message=(unsigned char*)old_data;
+                    gm->section_number=secnum;
+                    olen=len;
+                }
+                else
+                {
+                    if ( gm->message ) grib_context_free ( c,gm->message );
+                    gm->message=NULL;
+                    for ( i=0;i<8;i++ ) gm->sections[i]=NULL;
+                    gm->section_number=0;
+                    gm->message_length=0;
+                    olen=len;
+                }
+                break;
+            }
+        }
 
-	}
-	else
-	{
-		gm->message_length=0;
-		gm->message=NULL;
-	}
+    }
+    else
+    {
+        gm->message_length=0;
+        gm->message=NULL;
+    }
 
-	gl = grib_handle_new_from_message ( c, data, olen );
-	if ( !gl )
-	{
-		*error = GRIB_DECODING_ERROR;
-		grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle \n" );
-		grib_context_free ( c,data );
-		return NULL;
-	}
+    gl = grib_handle_new_from_message ( c, data, olen );
+    if ( !gl )
+    {
+        *error = GRIB_DECODING_ERROR;
+        grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle \n" );
+        grib_context_free ( c,data );
+        return NULL;
+    }
 
-	gl->offset=gm->offset;
-	gl->buffer->property = GRIB_MY_BUFFER;
-	c->handle_file_count++;
-	c->handle_total_count++;
+    gl->offset=gm->offset;
+    gl->buffer->property = GRIB_MY_BUFFER;
+    c->handle_file_count++;
+    c->handle_total_count++;
 
-	if ( c->gts_header_on && gtslen >=8 )
-	{
-		gl->gts_header=(char*)grib_context_malloc_clear ( c,sizeof ( unsigned char ) *gtslen );
-		memcpy ( gl->gts_header,gts_header,gtslen );
-		gl->gts_header_len=gtslen;
-		grib_context_free ( c,save_gts_header );
-		gtslen=0;
-	} else gl->gts_header=NULL;
+    if ( c->gts_header_on && gtslen >=8 )
+    {
+        gl->gts_header=(char*)grib_context_malloc_clear ( c,sizeof ( unsigned char ) *gtslen );
+        memcpy ( gl->gts_header,gts_header,gtslen );
+        gl->gts_header_len=gtslen;
+        grib_context_free ( c,save_gts_header );
+        gtslen=0;
+    } else gl->gts_header=NULL;
 
-	return gl;
+    return gl;
 }
 
 grib_handle* grib_new_from_file ( grib_context* c, FILE* f,int headers_only,int *error )
 {
-	grib_handle* h=0;
-	if (!f) {*error=GRIB_IO_PROBLEM; return NULL;}
+    grib_handle* h=0;
+    if (!f) {*error=GRIB_IO_PROBLEM; return NULL;}
 
-	if ( c == NULL ) c = grib_context_get_default();
+    if ( c == NULL ) c = grib_context_get_default();
 
-	if ( c->multi_support_on ) h=grib_handle_new_from_file_multi ( c,f,error );
-	else h=grib_handle_new_from_file_no_multi ( c,f,headers_only,error );
+    if ( c->multi_support_on ) h=grib_handle_new_from_file_multi ( c,f,error );
+    else h=grib_handle_new_from_file_no_multi ( c,f,headers_only,error );
 
-	if ( h && h->offset == 0 ) c->handle_file_count=1;
+    if ( h && h->offset == 0 ) c->handle_file_count=1;
 
-	if ( !c->no_fail_on_wrong_length && *error == GRIB_WRONG_LENGTH )
-	{
-		grib_handle_delete ( h );
-		h=NULL;
-	}
+    if ( !c->no_fail_on_wrong_length && *error == GRIB_WRONG_LENGTH )
+    {
+        grib_handle_delete ( h );
+        h=NULL;
+    }
 
-	return h;
+    return h;
 }
 
 grib_handle* gts_new_from_file ( grib_context* c, FILE* f,int *error )
 {
-	void *data = NULL;
-	size_t olen = 0;
-	grib_handle  *gl = NULL;
-	off_t offset=0;
+    void *data = NULL;
+    size_t olen = 0;
+    grib_handle  *gl = NULL;
+    off_t offset=0;
 
-	if ( c == NULL ) c = grib_context_get_default();
+    if ( c == NULL ) c = grib_context_get_default();
 
-	data = wmo_read_gts_from_file_malloc ( f, 0,&olen,&offset,error );
+    data = wmo_read_gts_from_file_malloc ( f, 0,&olen,&offset,error );
 
-	if ( *error != GRIB_SUCCESS )
-	{
-		if ( data ) grib_context_free ( c,data );
+    if ( *error != GRIB_SUCCESS )
+    {
+        if ( data ) grib_context_free ( c,data );
 
-		if ( *error == GRIB_END_OF_FILE ) *error = GRIB_SUCCESS;
-		return NULL;
-	}
+        if ( *error == GRIB_END_OF_FILE ) *error = GRIB_SUCCESS;
+        return NULL;
+    }
 
-	gl = grib_handle_new_from_message ( c, data, olen );
+    gl = grib_handle_new_from_message ( c, data, olen );
 
-	if ( !gl )
-	{
-		*error = GRIB_DECODING_ERROR;
-		grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle \n" );
-		grib_context_free ( c,data );
-		return NULL;
-	}
+    if ( !gl )
+    {
+        *error = GRIB_DECODING_ERROR;
+        grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle \n" );
+        grib_context_free ( c,data );
+        return NULL;
+    }
 
-	gl->offset=offset;
-	gl->buffer->property = GRIB_MY_BUFFER;
-	c->handle_file_count++;
-	c->handle_total_count++;
+    gl->offset=offset;
+    gl->buffer->property = GRIB_MY_BUFFER;
+    c->handle_file_count++;
+    c->handle_total_count++;
 
-	return gl;
+    return gl;
 }
 
 grib_handle* taf_new_from_file ( grib_context* c, FILE* f,int *error )
 {
-	void *data = NULL;
-	size_t olen = 0;
-	grib_handle  *gl = NULL;
-	off_t offset=0;
+    void *data = NULL;
+    size_t olen = 0;
+    grib_handle  *gl = NULL;
+    off_t offset=0;
 
-	if ( c == NULL ) c = grib_context_get_default();
+    if ( c == NULL ) c = grib_context_get_default();
 
-	data = wmo_read_taf_from_file_malloc ( f, 0,&olen,&offset,error );
+    data = wmo_read_taf_from_file_malloc ( f, 0,&olen,&offset,error );
 
-	if ( *error != GRIB_SUCCESS )
-	{
-		if ( data ) grib_context_free ( c,data );
+    if ( *error != GRIB_SUCCESS )
+    {
+        if ( data ) grib_context_free ( c,data );
 
-		if ( *error == GRIB_END_OF_FILE ) *error = GRIB_SUCCESS;
-		return NULL;
-	}
+        if ( *error == GRIB_END_OF_FILE ) *error = GRIB_SUCCESS;
+        return NULL;
+    }
 
-	gl = grib_handle_new_from_message ( c, data, olen );
+    gl = grib_handle_new_from_message ( c, data, olen );
 
-	if ( !gl )
-	{
-		*error = GRIB_DECODING_ERROR;
-		grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle \n" );
-		grib_context_free ( c,data );
-		return NULL;
-	}
+    if ( !gl )
+    {
+        *error = GRIB_DECODING_ERROR;
+        grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle \n" );
+        grib_context_free ( c,data );
+        return NULL;
+    }
 
     gl->offset=offset;
-	gl->buffer->property = GRIB_MY_BUFFER;
-	c->handle_file_count++;
-	c->handle_total_count++;
+    gl->buffer->property = GRIB_MY_BUFFER;
+    c->handle_file_count++;
+    c->handle_total_count++;
 
-	return gl;
+    return gl;
 }
 
 grib_handle* metar_new_from_file ( grib_context* c, FILE* f,int *error )
 {
-	void *data = NULL;
-	size_t olen = 0;
-	grib_handle  *gl = NULL;
-	off_t offset=0;
+    void *data = NULL;
+    size_t olen = 0;
+    grib_handle  *gl = NULL;
+    off_t offset=0;
 
-	if ( c == NULL ) c = grib_context_get_default();
+    if ( c == NULL ) c = grib_context_get_default();
 
-	data = wmo_read_metar_from_file_malloc ( f, 0,&olen,&offset,error );
+    data = wmo_read_metar_from_file_malloc ( f, 0,&olen,&offset,error );
 
-	if ( *error != GRIB_SUCCESS )
-	{
-		if ( data ) grib_context_free ( c,data );
+    if ( *error != GRIB_SUCCESS )
+    {
+        if ( data ) grib_context_free ( c,data );
 
-		if ( *error == GRIB_END_OF_FILE ) *error = GRIB_SUCCESS;
-		return NULL;
-	}
+        if ( *error == GRIB_END_OF_FILE ) *error = GRIB_SUCCESS;
+        return NULL;
+    }
 
-	gl = grib_handle_new_from_message ( c, data, olen );
+    gl = grib_handle_new_from_message ( c, data, olen );
 
-	if ( !gl )
-	{
-		*error = GRIB_DECODING_ERROR;
-		grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle \n" );
-		grib_context_free ( c,data );
-		return NULL;
-	}
+    if ( !gl )
+    {
+        *error = GRIB_DECODING_ERROR;
+        grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle \n" );
+        grib_context_free ( c,data );
+        return NULL;
+    }
 
     gl->offset=offset;
-	gl->buffer->property = GRIB_MY_BUFFER;
-	c->handle_file_count++;
-	c->handle_total_count++;
+    gl->buffer->property = GRIB_MY_BUFFER;
+    c->handle_file_count++;
+    c->handle_total_count++;
 
-	return gl;
+    return gl;
 }
 
 grib_handle* bufr_new_from_file ( grib_context* c, FILE* f,int *error )
 {
-	void *data = NULL;
-	size_t olen = 0;
-	grib_handle  *gl = NULL;
-	off_t offset=0;
+    void *data = NULL;
+    size_t olen = 0;
+    grib_handle  *gl = NULL;
+    off_t offset=0;
 
-	if ( c == NULL ) c = grib_context_get_default();
+    if ( c == NULL ) c = grib_context_get_default();
 
-	data = wmo_read_bufr_from_file_malloc ( f, 0,&olen,&offset,error );
+    data = wmo_read_bufr_from_file_malloc ( f, 0,&olen,&offset,error );
 
-	if ( *error != GRIB_SUCCESS )
-	{
-		if ( data ) grib_context_free ( c,data );
+    if ( *error != GRIB_SUCCESS )
+    {
+        if ( data ) grib_context_free ( c,data );
 
-		if ( *error == GRIB_END_OF_FILE ) *error = GRIB_SUCCESS;
-		return NULL;
-	}
+        if ( *error == GRIB_END_OF_FILE ) *error = GRIB_SUCCESS;
+        return NULL;
+    }
 
-	gl = grib_handle_new_from_message ( c, data, olen );
+    gl = grib_handle_new_from_message ( c, data, olen );
 
-	if ( !gl )
-	{
-		*error = GRIB_DECODING_ERROR;
-		grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle \n" );
-		grib_context_free ( c,data );
-		return NULL;
-	}
+    if ( !gl )
+    {
+        *error = GRIB_DECODING_ERROR;
+        grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle \n" );
+        grib_context_free ( c,data );
+        return NULL;
+    }
 
-	gl->offset=offset;
-	gl->buffer->property = GRIB_MY_BUFFER;
-	c->handle_file_count++;
-	c->handle_total_count++;
+    gl->offset=offset;
+    gl->buffer->property = GRIB_MY_BUFFER;
+    c->handle_file_count++;
+    c->handle_total_count++;
 
-	return gl;
+    return gl;
 }
 
 grib_handle* any_new_from_file ( grib_context* c, FILE* f,int *error )
@@ -914,559 +913,559 @@ grib_handle* any_new_from_file ( grib_context* c, FILE* f,int *error )
 
 static grib_handle* grib_handle_new_from_file_no_multi ( grib_context* c,FILE* f,int headers_only,int *error )
 {
-	void *data = NULL;
-	size_t olen = 0;
-	grib_handle  *gl = NULL;
-	off_t gts_header_offset=0;
-	off_t offset=0,end_msg_offset=0;
-	char *gts_header=0,*save_gts_header=0;
-	int gtslen=0;
+    void *data = NULL;
+    size_t olen = 0;
+    grib_handle  *gl = NULL;
+    off_t gts_header_offset=0;
+    off_t offset=0,end_msg_offset=0;
+    char *gts_header=0,*save_gts_header=0;
+    int gtslen=0;
 
-	if ( c == NULL ) c = grib_context_get_default();
-	data = wmo_read_grib_from_file_malloc ( f, headers_only,&olen,&offset,error );
-	end_msg_offset=offset+olen;
+    if ( c == NULL ) c = grib_context_get_default();
+    data = wmo_read_grib_from_file_malloc ( f, headers_only,&olen,&offset,error );
+    end_msg_offset=offset+olen;
 
-	if ( *error != GRIB_SUCCESS )
-	{
-		if ( data ) grib_context_free ( c,data );
+    if ( *error != GRIB_SUCCESS )
+    {
+        if ( data ) grib_context_free ( c,data );
 
-		if ( *error == GRIB_END_OF_FILE ) *error = GRIB_SUCCESS;
-		return NULL;
-	}
+        if ( *error == GRIB_END_OF_FILE ) *error = GRIB_SUCCESS;
+        return NULL;
+    }
 
-	if ( c->gts_header_on )
-	{
-		int g=0;
-		grib_context_seek ( c,gts_header_offset,SEEK_SET,f );
-		gtslen=offset-gts_header_offset;
-		gts_header=(char*)grib_context_malloc ( c,sizeof ( unsigned char ) *gtslen );
-		save_gts_header=gts_header;
-		grib_context_read ( c,gts_header,gtslen,f );
-		g=gtslen;
-		while ( gts_header!=NULL && g != 0 && *gts_header != '\03' )
-		{
-			/*printf("--------%d %X \n",gtslen,*gts_header);*/
-			gts_header++;
-			g--;
-		}
-		if ( g>8 ) {gts_header++;gtslen=g-1;}
-		else gts_header=save_gts_header;
-		grib_context_seek ( c,end_msg_offset,SEEK_SET,f );
-	}
+    if ( c->gts_header_on )
+    {
+        int g=0;
+        grib_context_seek ( c,gts_header_offset,SEEK_SET,f );
+        gtslen=offset-gts_header_offset;
+        gts_header=(char*)grib_context_malloc ( c,sizeof ( unsigned char ) *gtslen );
+        save_gts_header=gts_header;
+        grib_context_read ( c,gts_header,gtslen,f );
+        g=gtslen;
+        while ( gts_header!=NULL && g != 0 && *gts_header != '\03' )
+        {
+            /*printf("--------%d %X \n",gtslen,*gts_header);*/
+            gts_header++;
+            g--;
+        }
+        if ( g>8 ) {gts_header++;gtslen=g-1;}
+        else gts_header=save_gts_header;
+        grib_context_seek ( c,end_msg_offset,SEEK_SET,f );
+    }
 
-	if (headers_only) {
-		gl = grib_handle_new_from_partial_message ( c, data, olen );
-	} else {
-		gl = grib_handle_new_from_message ( c, data, olen );
-	}
+    if (headers_only) {
+        gl = grib_handle_new_from_partial_message ( c, data, olen );
+    } else {
+        gl = grib_handle_new_from_message ( c, data, olen );
+    }
 
-	if ( !gl )
-	{
-		*error = GRIB_DECODING_ERROR;
-		grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle \n" );
-		grib_context_free ( c,data );
-		return NULL;
-	}
+    if ( !gl )
+    {
+        *error = GRIB_DECODING_ERROR;
+        grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_file : cannot create handle \n" );
+        grib_context_free ( c,data );
+        return NULL;
+    }
 
-	gl->offset=offset;
-	gl->buffer->property = GRIB_MY_BUFFER;
+    gl->offset=offset;
+    gl->buffer->property = GRIB_MY_BUFFER;
 
-	c->handle_file_count++;
-	c->handle_total_count++;
+    c->handle_file_count++;
+    c->handle_total_count++;
 
-	if ( c->gts_header_on && gtslen >=8 )
-	{
-		gl->gts_header=(char*)grib_context_malloc ( c,sizeof ( unsigned char ) *gtslen );
-		memcpy ( gl->gts_header,gts_header,gtslen );
-		gl->gts_header_len=gtslen;
-		grib_context_free ( c,save_gts_header );
-		gtslen=0;
-	}
+    if ( c->gts_header_on && gtslen >=8 )
+    {
+        gl->gts_header=(char*)grib_context_malloc ( c,sizeof ( unsigned char ) *gtslen );
+        memcpy ( gl->gts_header,gts_header,gtslen );
+        gl->gts_header_len=gtslen;
+        grib_context_free ( c,save_gts_header );
+        gtslen=0;
+    }
 
-	return gl;
+    return gl;
 }
 
 grib_multi_handle* grib_multi_handle_new ( grib_context* c )
 {
-	grib_multi_handle* h;
-	if ( c==NULL ) c=grib_context_get_default();
-	if ( !c->multi_support_on ) c->multi_support_on=1;
+    grib_multi_handle* h;
+    if ( c==NULL ) c=grib_context_get_default();
+    if ( !c->multi_support_on ) c->multi_support_on=1;
 
-	h= ( grib_multi_handle* ) grib_context_malloc_clear ( c,sizeof ( grib_multi_handle ) );
-	if ( h==NULL )
-	{
-		grib_context_log ( c,GRIB_LOG_ERROR,
-				"grib_multi_handle_new: unable to allocate memory. %s",
-				grib_get_error_message ( GRIB_OUT_OF_MEMORY ) );
-		return NULL;
-	}
-	h->buffer = grib_create_growable_buffer ( c );
-	h->buffer->ulength=0;
-	h->context=c;
+    h= ( grib_multi_handle* ) grib_context_malloc_clear ( c,sizeof ( grib_multi_handle ) );
+    if ( h==NULL )
+    {
+        grib_context_log ( c,GRIB_LOG_ERROR,
+                "grib_multi_handle_new: unable to allocate memory. %s",
+                grib_get_error_message ( GRIB_OUT_OF_MEMORY ) );
+        return NULL;
+    }
+    h->buffer = grib_create_growable_buffer ( c );
+    h->buffer->ulength=0;
+    h->context=c;
 
-	return h;
+    return h;
 }
 
 int grib_multi_handle_delete ( grib_multi_handle* h )
 {
-	if ( h==NULL ) return GRIB_SUCCESS;
+    if ( h==NULL ) return GRIB_SUCCESS;
 
-	grib_buffer_delete ( h->context,h->buffer );
-	grib_context_free ( h->context,h );
-	return GRIB_SUCCESS;
+    grib_buffer_delete ( h->context,h->buffer );
+    grib_context_free ( h->context,h );
+    return GRIB_SUCCESS;
 }
 
 int grib_multi_handle_append ( grib_handle* h,int start_section,grib_multi_handle* mh )
 {
-	const void* mess=NULL;
-	unsigned char* p=NULL;
-	int err=0;
-	size_t mess_len = 0;
-	size_t total_len=0;
+    const void* mess=NULL;
+    unsigned char* p=NULL;
+    int err=0;
+    size_t mess_len = 0;
+    size_t total_len=0;
 
-	if ( !h )  return GRIB_NULL_HANDLE;
-	if ( !mh ) return GRIB_NULL_HANDLE;
+    if ( !h )  return GRIB_NULL_HANDLE;
+    if ( !mh ) return GRIB_NULL_HANDLE;
 
-	if ( start_section==0 || mh->buffer->ulength==0 )
-	{
-		err=grib_get_message ( h,&mess,&mess_len );
-		if ( err!=0 ) return err;
-		total_len=mh->buffer->ulength+mess_len;
+    if ( start_section==0 || mh->buffer->ulength==0 )
+    {
+        err=grib_get_message ( h,&mess,&mess_len );
+        if ( err!=0 ) return err;
+        total_len=mh->buffer->ulength+mess_len;
 
-		if ( total_len > mh->buffer->length )
-			grib_grow_buffer ( h->context,mh->buffer,total_len );
+        if ( total_len > mh->buffer->length )
+            grib_grow_buffer ( h->context,mh->buffer,total_len );
 
-		p=mh->buffer->data+mh->buffer->ulength;
-		memcpy ( p,mess,mess_len );
-		mh->offset=mh->buffer->ulength;
-		mh->buffer->ulength=total_len;
-		mh->length=mess_len;
+        p=mh->buffer->data+mh->buffer->ulength;
+        memcpy ( p,mess,mess_len );
+        mh->offset=mh->buffer->ulength;
+        mh->buffer->ulength=total_len;
+        mh->length=mess_len;
 
-	}
-	else
-	{
-		long off=0;
-		err=grib_get_partial_message ( h,&mess,&mess_len,start_section );
-		if ( err!=0 ) return err;
-		total_len=mh->buffer->ulength+mess_len-4;
+    }
+    else
+    {
+        long off=0;
+        err=grib_get_partial_message ( h,&mess,&mess_len,start_section );
+        if ( err!=0 ) return err;
+        total_len=mh->buffer->ulength+mess_len-4;
 
-		while ( total_len > mh->buffer->length )
-			grib_grow_buffer ( h->context,mh->buffer,total_len );
+        while ( total_len > mh->buffer->length )
+            grib_grow_buffer ( h->context,mh->buffer,total_len );
 
-		p=mh->buffer->data+mh->buffer->ulength-4;
-		memcpy ( p,mess,mess_len );
-		mh->length+=mess_len-4;
+        p=mh->buffer->data+mh->buffer->ulength-4;
+        memcpy ( p,mess,mess_len );
+        mh->length+=mess_len-4;
 
-		off=mh->offset+64;
+        off=mh->offset+64;
 
-		grib_encode_unsigned_long ( mh->buffer->data, mh->length,  &off,  64 );
-		mh->buffer->ulength=total_len;
-	}
-	return err;
+        grib_encode_unsigned_long ( mh->buffer->data, mh->length,  &off,  64 );
+        mh->buffer->ulength=total_len;
+    }
+    return err;
 }
 
 int grib_multi_handle_write ( grib_multi_handle* h,FILE* f )
 {
-	if ( f==NULL ) return GRIB_INVALID_FILE;
-	if ( h==NULL ) return GRIB_INVALID_GRIB;
+    if ( f==NULL ) return GRIB_INVALID_FILE;
+    if ( h==NULL ) return GRIB_INVALID_GRIB;
 
-	if ( fwrite ( h->buffer->data,1,h->buffer->ulength,f ) != h->buffer->ulength )
-	{
-		grib_context_log ( h->context,GRIB_LOG_PERROR,"grib_multi_handle_write writing on file" );
-		return GRIB_IO_PROBLEM;
-	}
+    if ( fwrite ( h->buffer->data,1,h->buffer->ulength,f ) != h->buffer->ulength )
+    {
+        grib_context_log ( h->context,GRIB_LOG_PERROR,"grib_multi_handle_write writing on file" );
+        return GRIB_IO_PROBLEM;
+    }
 
-	return 0;
+    return 0;
 }
 
 int grib_get_partial_message ( grib_handle* h,const void** msg,size_t* len,int start_section )
 {
-	size_t partial_len=0;
-	long section_offset=0;
-	if ( !h ) return GRIB_NULL_HANDLE;
+    size_t partial_len=0;
+    long section_offset=0;
+    if ( !h ) return GRIB_NULL_HANDLE;
 
-	if ( start_section>h->sections_count )
-		return GRIB_INVALID_SECTION_NUMBER;
+    if ( start_section>h->sections_count )
+        return GRIB_INVALID_SECTION_NUMBER;
 
-	grib_get_long ( h,h->section_offset[start_section],&section_offset );
-	partial_len=h->buffer->ulength-section_offset;
+    grib_get_long ( h,h->section_offset[start_section],&section_offset );
+    partial_len=h->buffer->ulength-section_offset;
 
-	*len=partial_len;
-	*msg  = h->buffer->data+section_offset;
+    *len=partial_len;
+    *msg  = h->buffer->data+section_offset;
 
-	return GRIB_SUCCESS;
+    return GRIB_SUCCESS;
 }
 
 int grib_get_partial_message_copy ( grib_handle* h ,  void* message,size_t *len,
-		int start_section )
+        int start_section )
 {
-	size_t partial_len=0;
-	long section_offset=0;
-	if ( !h ) return GRIB_NULL_HANDLE;
+    size_t partial_len=0;
+    long section_offset=0;
+    if ( !h ) return GRIB_NULL_HANDLE;
 
-	if ( start_section>h->sections_count )
-		return GRIB_INVALID_SECTION_NUMBER;
+    if ( start_section>h->sections_count )
+        return GRIB_INVALID_SECTION_NUMBER;
 
-	grib_get_long ( h,h->section_offset[start_section],&section_offset );
-	partial_len=h->buffer->ulength-section_offset;
+    grib_get_long ( h,h->section_offset[start_section],&section_offset );
+    partial_len=h->buffer->ulength-section_offset;
 
-	if ( *len < partial_len ) return GRIB_BUFFER_TOO_SMALL;
+    if ( *len < partial_len ) return GRIB_BUFFER_TOO_SMALL;
 
-	*len=partial_len;
+    *len=partial_len;
 
-	memcpy ( message,h->buffer->data+section_offset,*len );
-	return GRIB_SUCCESS;
+    memcpy ( message,h->buffer->data+section_offset,*len );
+    return GRIB_SUCCESS;
 }
 
 int grib_get_message_copy ( grib_handle* h ,  void* message,size_t *len )
 {
-	if ( !h )
-		return GRIB_NOT_FOUND;
+    if ( !h )
+        return GRIB_NOT_FOUND;
 
-	if ( *len < h->buffer->ulength )
-		return GRIB_BUFFER_TOO_SMALL;
+    if ( *len < h->buffer->ulength )
+        return GRIB_BUFFER_TOO_SMALL;
 
-	*len=h->buffer->ulength;
+    *len=h->buffer->ulength;
 
-	memcpy ( message,h->buffer->data,*len );
-	return GRIB_SUCCESS;
+    memcpy ( message,h->buffer->data,*len );
+    return GRIB_SUCCESS;
 }
 
 int grib_get_message_offset ( grib_handle* h,off_t* offset ) {
 
-	if (h) *offset=h->offset;
-	else return GRIB_INTERNAL_ERROR;
+    if (h) *offset=h->offset;
+    else return GRIB_INTERNAL_ERROR;
 
-	return 0;
+    return 0;
 }
 
 int grib_get_message_size ( grib_handle* h,size_t* size ) {
-	long totalLength=0;
-	int ret=0;
-	*size =  h->buffer->ulength;
-	ret=grib_get_long(h,"totalLength",&totalLength);
-	if (!ret) *size=totalLength;
-	return ret;
+    long totalLength=0;
+    int ret=0;
+    *size =  h->buffer->ulength;
+    ret=grib_get_long(h,"totalLength",&totalLength);
+    if (!ret) *size=totalLength;
+    return ret;
 }
 
 int grib_get_message ( grib_handle* h,const void** msg,size_t* size )
 {
-	long totalLength=0;
-	int ret=0;
-	*msg  =  h->buffer->data;
-	*size =  h->buffer->ulength;
+    long totalLength=0;
+    int ret=0;
+    *msg  =  h->buffer->data;
+    *size =  h->buffer->ulength;
 
-	ret=grib_get_long(h,"totalLength",&totalLength);
-	if (!ret) *size=totalLength;
+    ret=grib_get_long(h,"totalLength",&totalLength);
+    if (!ret) *size=totalLength;
 
-	if ( h->context->gts_header_on && h->gts_header )
-	{
-		char strbuf[10];
-		sprintf ( strbuf,"%.8d", ( int ) ( h->buffer->ulength+h->gts_header_len-6 ) );
-		memcpy ( h->gts_header,strbuf,8 );
-	}
-	return 0;
+    if ( h->context->gts_header_on && h->gts_header )
+    {
+        char strbuf[10];
+        sprintf ( strbuf,"%.8d", ( int ) ( h->buffer->ulength+h->gts_header_len-6 ) );
+        memcpy ( h->gts_header,strbuf,8 );
+    }
+    return 0;
 }
 
 int grib_get_message_headers ( grib_handle* h,const void** msg,size_t* size )
 {
-	int ret=0;
-	size_t endOfHeadersMaker;
-	*msg  =  h->buffer->data;
-	*size =  h->buffer->ulength;
+    int ret=0;
+    size_t endOfHeadersMaker;
+    *msg  =  h->buffer->data;
+    *size =  h->buffer->ulength;
 
-	if ((ret=grib_get_offset(h,"endOfHeadersMaker",&endOfHeadersMaker))!=GRIB_SUCCESS) {
-		grib_context_log(h->context,GRIB_LOG_FATAL,
-				"grib_get_message_headers unable to get offset of endOfHeadersMaker");
-		return ret;
-	}
+    if ((ret=grib_get_offset(h,"endOfHeadersMaker",&endOfHeadersMaker))!=GRIB_SUCCESS) {
+        grib_context_log(h->context,GRIB_LOG_FATAL,
+                "grib_get_message_headers unable to get offset of endOfHeadersMaker");
+        return ret;
+    }
 
-	*size=endOfHeadersMaker;
+    *size=endOfHeadersMaker;
 
-	return ret;
+    return ret;
 }
 
 grib_handle *grib_handle_new ( grib_context* c )
 {
-	grib_handle* h;
+    grib_handle* h;
 
-	if ( !c ) c = grib_context_get_default();
-	h  = grib_new_handle ( c );
-	h->buffer = grib_create_growable_buffer ( c );
-	if ( h->buffer == NULL )
-	{
-		grib_handle_delete ( h );
-		return NULL;
-	}
-	h->root   = grib_create_root_section ( h->context,h );
+    if ( !c ) c = grib_context_get_default();
+    h  = grib_new_handle ( c );
+    h->buffer = grib_create_growable_buffer ( c );
+    if ( h->buffer == NULL )
+    {
+        grib_handle_delete ( h );
+        return NULL;
+    }
+    h->root   = grib_create_root_section ( h->context,h );
 
-	if ( !h->root )
-	{
-		grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_message: cannot create root section" );
-		grib_handle_delete ( h );
-		return NULL;
-	}
+    if ( !h->root )
+    {
+        grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_message: cannot create root section" );
+        grib_handle_delete ( h );
+        return NULL;
+    }
 
-	if ( !h->context->grib_reader || !h->context->grib_reader->first )
-	{
-		grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_message: cannot create handle, no definitions found" );
-		grib_handle_delete ( h );
-		return NULL;
-	}
+    if ( !h->context->grib_reader || !h->context->grib_reader->first )
+    {
+        grib_context_log ( c, GRIB_LOG_ERROR, "grib_handle_new_from_message: cannot create handle, no definitions found" );
+        grib_handle_delete ( h );
+        return NULL;
+    }
 
-	h->buffer->property = GRIB_USER_BUFFER;
+    h->buffer->property = GRIB_USER_BUFFER;
 
-	h->header_mode=1;
+    h->header_mode=1;
 
-	return h;
+    return h;
 }
 
 grib_action* grib_action_from_filter ( const char* filter )
 {
-	grib_action* a = NULL;
-	grib_context* context=grib_context_get_default();
-	a = grib_parse_file ( context, filter );
-	context->grib_reader=NULL;
-	return a;
+    grib_action* a = NULL;
+    grib_context* context=grib_context_get_default();
+    a = grib_parse_file ( context, filter );
+    context->grib_reader=NULL;
+    return a;
 }
 
 int grib_handle_apply_action ( grib_handle* h,grib_action* a )
 {
-	int err;
-	grib_action* ao = a;
+    int err;
+    grib_action* ao = a;
 
-	if ( !a ) return GRIB_SUCCESS; /* TODO: return error */
+    if ( !a ) return GRIB_SUCCESS; /* TODO: return error */
 
-	while ( a )
-	{
-		err = grib_action_execute ( a,h );
-		if ( err != GRIB_SUCCESS )
-			return err;
-		a = a->next;
-	}
+    while ( a )
+    {
+        err = grib_action_execute ( a,h );
+        if ( err != GRIB_SUCCESS )
+            return err;
+        a = a->next;
+    }
 
-	a=ao;
+    a=ao;
 
-	return GRIB_SUCCESS;
+    return GRIB_SUCCESS;
 }
 
 int grib_handle_prepare_action ( grib_handle* h,grib_action* a )
 {
-	int err;
-	grib_action* ao = a;
+    int err;
+    grib_action* ao = a;
 
-	if ( !a ) return GRIB_SUCCESS; /* TODO: return error */
+    if ( !a ) return GRIB_SUCCESS; /* TODO: return error */
 
-	while ( a )
-	{
-		err = grib_action_execute ( a,h );
-		if ( err != GRIB_SUCCESS )
-			return err;
-		a = a->next;
-	}
+    while ( a )
+    {
+        err = grib_action_execute ( a,h );
+        if ( err != GRIB_SUCCESS )
+            return err;
+        a = a->next;
+    }
 
-	a=ao;
+    a=ao;
 
-	return GRIB_SUCCESS;
+    return GRIB_SUCCESS;
 }
 
 static int grib2_get_next_section ( unsigned char* msgbegin,size_t msglen,unsigned char** secbegin,size_t* seclen,int* secnum,int* err )
 {
 
-	if ( !grib2_has_next_section ( msgbegin,msglen,*secbegin,*seclen,err ) )
-		return 0;
+    if ( !grib2_has_next_section ( msgbegin,msglen,*secbegin,*seclen,err ) )
+        return 0;
 
-	*secbegin+=*seclen;
-	*seclen=grib_decode_unsigned_byte_long ( *secbegin,0,4 );
-	*secnum=grib_decode_unsigned_byte_long ( *secbegin,4,1 );
+    *secbegin+=*seclen;
+    *seclen=grib_decode_unsigned_byte_long ( *secbegin,0,4 );
+    *secnum=grib_decode_unsigned_byte_long ( *secbegin,4,1 );
 
-	if ( *secnum < 1 || *secnum > 7 )
-	{
-		*err=GRIB_INVALID_SECTION_NUMBER;
-		return 0;
-	}
-	return 1;
+    if ( *secnum < 1 || *secnum > 7 )
+    {
+        *err=GRIB_INVALID_SECTION_NUMBER;
+        return 0;
+    }
+    return 1;
 }
 
 static int grib2_has_next_section ( unsigned char* msgbegin,size_t msglen,unsigned char* secbegin,size_t seclen,int* err )
 {
-	long next_seclen;
-	*err=0;
+    long next_seclen;
+    *err=0;
 
-	next_seclen= ( msgbegin+msglen )- ( secbegin+seclen );
+    next_seclen= ( msgbegin+msglen )- ( secbegin+seclen );
 
-	if ( next_seclen < 5 )
-	{
-		if ( ( next_seclen > 3 ) && !strncmp ( ( char* ) secbegin,"7777",4 ) )
-			*err=GRIB_SUCCESS;
-		else *err=GRIB_7777_NOT_FOUND;
-		return 0;
-	}
+    if ( next_seclen < 5 )
+    {
+        if ( ( next_seclen > 3 ) && !strncmp ( ( char* ) secbegin,"7777",4 ) )
+            *err=GRIB_SUCCESS;
+        else *err=GRIB_7777_NOT_FOUND;
+        return 0;
+    }
 
-	secbegin+=seclen;
+    secbegin+=seclen;
 
-	return 1;
+    return 1;
 }
 
 static void grib2_build_message ( grib_context* context,unsigned char* sections[],size_t sections_len[],void** data,size_t* len )
 {
-	int i=0;
-	char* theEnd="7777";
-	unsigned char* sec0;
-	unsigned char* p=0;
-	size_t msglen=0;
-	long bitp=64;
-	if ( !sections[0] )
-	{
-		*data=NULL;
-		return;
-	}
-	sec0=sections[0];
-	for ( i=0;i<8;i++ ) msglen+= sections_len[i];
-	msglen+=4;
-	if ( *len<msglen ) msglen=*len;
+    int i=0;
+    char* theEnd="7777";
+    unsigned char* sec0;
+    unsigned char* p=0;
+    size_t msglen=0;
+    long bitp=64;
+    if ( !sections[0] )
+    {
+        *data=NULL;
+        return;
+    }
+    sec0=sections[0];
+    for ( i=0;i<8;i++ ) msglen+= sections_len[i];
+    msglen+=4;
+    if ( *len<msglen ) msglen=*len;
 
-	*data= ( unsigned char* ) grib_context_malloc ( context,msglen );
-	p=(unsigned char*)*data;
+    *data= ( unsigned char* ) grib_context_malloc ( context,msglen );
+    p=(unsigned char*)*data;
 
-	for ( i=0;i<8;i++ )
-	{
-		if ( sections[i] )
-		{
-			memcpy ( p,sections[i],sections_len[i] );
-			p+=sections_len[i];
-		}
-	}
+    for ( i=0;i<8;i++ )
+    {
+        if ( sections[i] )
+        {
+            memcpy ( p,sections[i],sections_len[i] );
+            p+=sections_len[i];
+        }
+    }
 
-	memcpy ( p,theEnd,4 );
+    memcpy ( p,theEnd,4 );
 
-	grib_encode_unsigned_long ( (unsigned char*)*data,msglen,&bitp,64 );
+    grib_encode_unsigned_long ( (unsigned char*)*data,msglen,&bitp,64 );
 
-	*len=msglen;
+    *len=msglen;
 }
 
 void grib_multi_support_on ( grib_context* c )
 {
-	if ( !c ) c=grib_context_get_default();
-	c->multi_support_on=1;
+    if ( !c ) c=grib_context_get_default();
+    c->multi_support_on=1;
 }
 
 void grib_multi_support_off ( grib_context* c )
 {
-	if ( !c ) c=grib_context_get_default();
-	c->multi_support_on=0;
+    if ( !c ) c=grib_context_get_default();
+    c->multi_support_on=0;
 }
 
 /* For multi support mode: Reset all file handles equal to f. See GRIB-249 */
 void grib_multi_support_reset_file(grib_context* c, FILE* f)
 {
-	grib_multi_support* gm = NULL;
-	if ( !c ) c = grib_context_get_default();
-	gm = c->multi_support;
-	while ( gm ) {
-		if ( gm->file == f ) {
-			gm->file = NULL;
-		}
-		gm=gm->next;
-	}
+    grib_multi_support* gm = NULL;
+    if ( !c ) c = grib_context_get_default();
+    gm = c->multi_support;
+    while ( gm ) {
+        if ( gm->file == f ) {
+            gm->file = NULL;
+        }
+        gm=gm->next;
+    }
 }
 
 void grib_gts_header_on ( grib_context* c )
 {
-	if ( !c ) c=grib_context_get_default();
-	c->gts_header_on=1;
+    if ( !c ) c=grib_context_get_default();
+    c->gts_header_on=1;
 }
 
 void grib_gts_header_off ( grib_context* c )
 {
-	if ( !c ) c=grib_context_get_default();
-	c->gts_header_on=0;
+    if ( !c ) c=grib_context_get_default();
+    c->gts_header_on=0;
 }
 
 int grib_get_gribex_mode ( grib_context* c)
 {
-	if ( !c ) c=grib_context_get_default();
-	return c->gribex_mode_on;
+    if ( !c ) c=grib_context_get_default();
+    return c->gribex_mode_on;
 }
 
 void grib_gribex_mode_on ( grib_context* c )
 {
-	if ( !c ) c=grib_context_get_default();
-	c->gribex_mode_on=1;
+    if ( !c ) c=grib_context_get_default();
+    c->gribex_mode_on=1;
 }
 
 void grib_gribex_mode_off ( grib_context* c )
 {
-	if ( !c ) c=grib_context_get_default();
-	c->gribex_mode_on=0;
+    if ( !c ) c=grib_context_get_default();
+    c->gribex_mode_on=0;
 }
 
 static grib_multi_support* grib_get_multi_support ( grib_context* c, FILE* f )
 {
-	int i=0;
-	grib_multi_support* gm=c->multi_support;
-	grib_multi_support* prev=NULL;
+    int i=0;
+    grib_multi_support* gm=c->multi_support;
+    grib_multi_support* prev=NULL;
 
-	while ( gm )
-	{
-		if ( gm->file == f ) return gm;
-		prev=gm;
-		gm=gm->next;
-	}
+    while ( gm )
+    {
+        if ( gm->file == f ) return gm;
+        prev=gm;
+        gm=gm->next;
+    }
 
-	if ( !gm )
-	{
-		gm=grib_multi_support_new ( c );
-		if ( !c->multi_support ) c->multi_support=gm;
-		else prev->next=gm;
-	}
+    if ( !gm )
+    {
+        gm=grib_multi_support_new ( c );
+        if ( !c->multi_support ) c->multi_support=gm;
+        else prev->next=gm;
+    }
 
-	gm->next=0;
-	if ( gm->message ) grib_context_free ( c,gm->message );
-	gm->message=NULL;
-	gm->section_number=0;
-	gm->sections_length[0]=16;
-	for ( i=1;i<8;i++ ) gm->sections_length[i]=0;
-	gm->sections_length[8]=4;
-	gm->file=f;
+    gm->next=0;
+    if ( gm->message ) grib_context_free ( c,gm->message );
+    gm->message=NULL;
+    gm->section_number=0;
+    gm->sections_length[0]=16;
+    for ( i=1;i<8;i++ ) gm->sections_length[i]=0;
+    gm->sections_length[8]=4;
+    gm->file=f;
 
-	return gm;
+    return gm;
 }
 
 void grib_multi_support_reset ( grib_context* c )
 {
-	grib_multi_support* gm=c->multi_support;
-	grib_multi_support* next=NULL;
-	int i=0;
-	while ( next )
-	{
-		next=gm->next;
-		if ( gm->file ) fclose ( gm->file );
-		if ( gm->message ) grib_context_free ( c,gm->message );
-		gm->message=NULL;
-		for ( i=0;i<8;i++ ) gm->sections[i]=0;
-		if ( gm->bitmap_section ) grib_context_free ( c,gm->bitmap_section );
-		gm->bitmap_section=NULL;
-		grib_context_free ( c,gm );
-		gm=NULL;
-	}
+    grib_multi_support* gm=c->multi_support;
+    grib_multi_support* next=NULL;
+    int i=0;
+    while ( next )
+    {
+        next=gm->next;
+        if ( gm->file ) fclose ( gm->file );
+        if ( gm->message ) grib_context_free ( c,gm->message );
+        gm->message=NULL;
+        for ( i=0;i<8;i++ ) gm->sections[i]=0;
+        if ( gm->bitmap_section ) grib_context_free ( c,gm->bitmap_section );
+        gm->bitmap_section=NULL;
+        grib_context_free ( c,gm );
+        gm=NULL;
+    }
 }
 
 static grib_multi_support* grib_multi_support_new ( grib_context* c )
 {
-	int i=0;
-	grib_multi_support* gm=
-			( grib_multi_support* ) grib_context_malloc_clear ( c,sizeof ( grib_multi_support ) );
-	gm->file=NULL;
-	gm->message=NULL;
-	gm->message_length=0;
-	gm->bitmap_section=NULL;
-	gm->bitmap_section_length=0;
-	gm->section_number=0;
-	gm->next=0;
-	gm->sections_length[0]=16;
-	for ( i=1;i<8;i++ ) gm->sections_length[i]=0;
-	gm->sections_length[8]=4;
+    int i=0;
+    grib_multi_support* gm=
+            ( grib_multi_support* ) grib_context_malloc_clear ( c,sizeof ( grib_multi_support ) );
+    gm->file=NULL;
+    gm->message=NULL;
+    gm->message_length=0;
+    gm->bitmap_section=NULL;
+    gm->bitmap_section_length=0;
+    gm->section_number=0;
+    gm->next=0;
+    gm->sections_length[0]=16;
+    for ( i=1;i<8;i++ ) gm->sections_length[i]=0;
+    gm->sections_length[8]=4;
 
-	return gm;
+    return gm;
 }