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

Refactoring

This commit is contained in:
Shahram Najm 2023-12-15 18:29:55 +00:00
parent 483316197a
commit 5c135b6b30
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/grib_api_internal.h
View File

@ -950,7 +950,7 @@ struct grib_multi_support
unsigned char* sections[8]; unsigned char* sections[8];
unsigned char* bitmap_section; unsigned char* bitmap_section;
size_t bitmap_section_length; size_t bitmap_section_length;
size_t sections_length[9]; size_t sections_length[9]; /* GRIB2 has 9 sections */
int section_number; int section_number;
grib_multi_support* next; grib_multi_support* next;
}; };

15
src/grib_handle.cc
View File

@ -17,7 +17,7 @@
static grib_handle* grib_handle_new_from_file_no_multi(grib_context* c, FILE* f, int headers_only, int* error); static grib_handle* grib_handle_new_from_file_no_multi(grib_context* c, FILE* f, int headers_only, int* error);
static grib_handle* grib_handle_new_from_file_multi(grib_context* c, FILE* f, int* error); static grib_handle* grib_handle_new_from_file_multi(grib_context* c, FILE* f, int* error);
static bool grib2_get_next_section(unsigned char* msgbegin, size_t msglen, unsigned char** secbegin, size_t* seclen, int* secnum, int* err); static bool grib2_get_next_section(unsigned char* msgbegin, size_t msglen, unsigned char** secbegin, size_t* seclen, int* secnum, int* err);
static int grib2_has_next_section(unsigned char* msgbegin, size_t msglen, unsigned char* secbegin, size_t seclen, int* err); static bool grib2_has_next_section(unsigned char* msgbegin, size_t msglen, unsigned char* secbegin, size_t seclen, int* err);
static void grib2_build_message(grib_context* context, unsigned char* sections[], size_t sections_len[], void** data, size_t* msglen); static void grib2_build_message(grib_context* context, unsigned char* sections[], size_t sections_len[], void** data, size_t* msglen);
static grib_multi_support* grib_get_multi_support(grib_context* c, FILE* f); static grib_multi_support* grib_get_multi_support(grib_context* c, FILE* f);
static grib_multi_support* grib_multi_support_new(grib_context* c); static grib_multi_support* grib_multi_support_new(grib_context* c);
@ -1483,7 +1483,7 @@ static bool grib2_get_next_section(unsigned char* msgbegin, size_t msglen, unsig
return true; return true;
} }
static int grib2_has_next_section(unsigned char* msgbegin, size_t msglen, unsigned char* secbegin, size_t seclen, int* err) static bool grib2_has_next_section(unsigned char* msgbegin, size_t msglen, unsigned char* secbegin, size_t seclen, int* err)
{ {
long next_seclen; long next_seclen;
*err = 0; *err = 0;
@ -1495,12 +1495,12 @@ static int grib2_has_next_section(unsigned char* msgbegin, size_t msglen, unsign
*err = GRIB_SUCCESS; *err = GRIB_SUCCESS;
else else
*err = GRIB_7777_NOT_FOUND; *err = GRIB_7777_NOT_FOUND;
return 0; return false;
} }
/*secbegin += seclen;*/ /*secbegin += seclen;*/
return 1; return true;
} }
static void grib2_build_message(grib_context* context, unsigned char* sections[], size_t sections_len[], void** data, size_t* len) static void grib2_build_message(grib_context* context, unsigned char* sections[], size_t sections_len[], void** data, size_t* len)
@ -1615,6 +1615,8 @@ void grib_multi_support_reset(grib_context* c)
static grib_multi_support* grib_multi_support_new(grib_context* c) static grib_multi_support* grib_multi_support_new(grib_context* c)
{ {
// GRIB edition 2 has 9 sections ( 0 to 8 )
const int GRIB2_END_SECTION = 8;
int i = 0; int i = 0;
grib_multi_support* gm = grib_multi_support* gm =
(grib_multi_support*)grib_context_malloc_clear(c, sizeof(grib_multi_support)); (grib_multi_support*)grib_context_malloc_clear(c, sizeof(grib_multi_support));
@ -1626,9 +1628,10 @@ static grib_multi_support* grib_multi_support_new(grib_context* c)
gm->section_number = 0; gm->section_number = 0;
gm->next = 0; gm->next = 0;
gm->sections_length[0] = 16; gm->sections_length[0] = 16;
for (i = 1; i < 8; i++)
for (i = 1; i < GRIB2_END_SECTION; i++)
gm->sections_length[i] = 0; gm->sections_length[i] = 0;
gm->sections_length[8] = 4; gm->sections_length[GRIB2_END_SECTION] = 4; // The 7777
return gm; return gm;
} }