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

Error handling

This commit is contained in:
shahramn 2024-04-07 14:28:29 +01:00
parent 8ae55cbf0c
commit 69ec58ed14
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/grib_accessor_class_g1_half_byte_codeflag.cc
View File

@ -115,13 +115,11 @@ static void dump(grib_accessor* a, grib_dumper* dumper)
static int unpack_long(grib_accessor* a, long* val, size_t* len)
{
unsigned char dat = 0;
if (*len < 1) {
grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
*len = 0;
*len = 1;
return GRIB_ARRAY_TOO_SMALL;
}
dat = grib_handle_of_accessor(a)->buffer->data[a->offset] & 0x0f;
unsigned char dat = grib_handle_of_accessor(a)->buffer->data[a->offset] & 0x0f;
*val = dat;
*len = 1;
@ -130,18 +128,17 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
static int pack_long(grib_accessor* a, const long* val, size_t* len)
{
int ret = 0;
if (*len < 1) {
grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
*len = 0;
*len = 1;
return GRIB_ARRAY_TOO_SMALL;
}
/* printf("HALF BYTE pack long %ld %02x\n",*val,grib_handle_of_accessor(a)->buffer->data[a->offset]);*/
// printf("HALF BYTE pack long %ld %02x\n",*val,grib_handle_of_accessor(a)->buffer->data[a->offset]);
grib_handle_of_accessor(a)->buffer->data[a->offset] = (a->parent->h->buffer->data[a->offset] & 0xf0) | (*val & 0x0f);
/* printf("HALF BYTE pack long %ld %02x\n",*val,grib_handle_of_accessor(a)->buffer->data[a->offset]);*/
// printf("HALF BYTE pack long %ld %02x\n",*val,grib_handle_of_accessor(a)->buffer->data[a->offset]);
*len = 1;
return ret;
return GRIB_SUCCESS;
}
static int get_native_type(grib_accessor* a)

22
src/grib_accessor_class_smart_table.cc
View File

@ -8,10 +8,6 @@
* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
*/
/*****************************************
* Enrico Fucile
****************************************/
#include "grib_api_internal.h"
#include <cctype>
@ -253,10 +249,10 @@ static grib_smart_table* load_table(grib_accessor* a)
next = next->next;
}
/* Note: self->widthOfCode is chosen so that 2^width is bigger than the maximum descriptor code,
* which for BUFR4 is the Table C operator 243255
*/
size = (1ULL << self->widthOfCode); /* = 2^self->widthOfCode (as a 64 bit number) */
// Note: self->widthOfCode is chosen so that 2^width is bigger than the maximum descriptor code,
// which for BUFR4 is the Table C operator 243255
//
size = (1ULL << self->widthOfCode); // = 2^self->widthOfCode (as a 64 bit number)
t = (grib_smart_table*)grib_context_malloc_clear_persistent(c, sizeof(grib_smart_table));
t->entries = (grib_smart_table_entry*)grib_context_malloc_clear_persistent(c, size * sizeof(grib_smart_table_entry));
@ -344,7 +340,7 @@ static int grib_load_smart_table(grib_context* c, const char* filename,
*p = 0;
numberOfColumns = 0;
/* The highest possible descriptor code must fit into t->numberOfEntries */
// The highest possible descriptor code must fit into t->numberOfEntries
DEBUG_ASSERT(code < t->numberOfEntries);
while (*s) {
char* tcol = t->entries[code].column[numberOfColumns];
@ -455,7 +451,7 @@ static int get_table_codes(grib_accessor* a)
if (!self->dirty)
return 0;
table_size = (1 << self->widthOfCode); /* 2 ^ self->widthOfCode */
table_size = (1 << self->widthOfCode); // 2 ^ self->widthOfCode
if (!self->table)
self->table = load_table(a);
@ -523,8 +519,8 @@ static void destroy(grib_context* context, grib_accessor* a)
static int get_native_type(grib_accessor* a)
{
int type = GRIB_TYPE_LONG;
/*printf("---------- %s flags=%ld GRIB_ACCESSOR_FLAG_STRING_TYPE=%d\n",
a->name,a->flags,GRIB_ACCESSOR_FLAG_STRING_TYPE);*/
//printf("---------- %s flags=%ld GRIB_ACCESSOR_FLAG_STRING_TYPE=%d\n",
// a->name,a->flags,GRIB_ACCESSOR_FLAG_STRING_TYPE);
if (a->flags & GRIB_ACCESSOR_FLAG_STRING_TYPE)
type = GRIB_TYPE_STRING;
return type;
@ -546,7 +542,7 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
if (*len < self->tableCodesSize) {
grib_context_log(a->context, GRIB_LOG_ERROR,
"Wrong size (%zu) for %s, it contains %zu values", *len, a->name, self->tableCodesSize);
*len = 0;
*len = self->tableCodesSize;
return GRIB_ARRAY_TOO_SMALL;
}

6
src/grib_accessor_class_transient_darray.cc
View File

@ -159,7 +159,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
value_count(a, &count);
if (*len < count) {
grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s (setting %ld, required %ld) ", a->name, *len, count);
grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s (setting %zu, required %ld)", a->name, *len, count);
*len = count;
return GRIB_ARRAY_TOO_SMALL;
}
@ -178,7 +179,8 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
value_count(a, &count);
if (*len < count) {
grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s (setting %ld, required %ld) ", a->name, *len, count);
grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s (setting %zu, required %ld)", a->name, *len, count);
*len = count;
return GRIB_ARRAY_TOO_SMALL;
}