mirror of https://github.com/ecmwf/eccodes.git
Dead code removal
This commit is contained in:
Shahram Najm
parent
8cb098cd95
commit
62e9830bcf
|
|
@ -22,7 +22,6 @@
|
|||
IMPLEMENTS = value_count
|
||||
IMPLEMENTS = next_offset
|
||||
IMPLEMENTS = get_native_type
|
||||
IMPLEMENTS = compare
|
||||
MEMBERS = const char* key
|
||||
MEMBERS = long start
|
||||
MEMBERS = size_t length
|
||||
|
|
@ -52,7 +51,6 @@ static long next_offset(grib_accessor*);
|
|||
static int value_count(grib_accessor*, long*);
|
||||
static void dump(grib_accessor*, grib_dumper*);
|
||||
static void init(grib_accessor*, const long, grib_arguments*);
|
||||
static int compare(grib_accessor*, grib_accessor*);
|
||||
|
||||
typedef struct grib_accessor_to_integer
|
||||
{
|
||||
|
|
@ -104,7 +102,7 @@ static grib_accessor_class _grib_accessor_class_to_integer = {
|
|||
0, /* resize */
|
||||
0, /* nearest_smaller_value */
|
||||
0, /* next accessor */
|
||||
&compare, /* compare vs. another accessor */
|
||||
0, /* compare vs. another accessor */
|
||||
0, /* unpack only ith value (double) */
|
||||
0, /* unpack only ith value (float) */
|
||||
0, /* unpack a given set of elements (double) */
|
||||
|
|
@ -239,46 +237,6 @@ static int unpack_double(grib_accessor* a, double* v, size_t* len)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int compare(grib_accessor* a, grib_accessor* b)
|
||||
{
|
||||
int retval = 0;
|
||||
char* aval = 0;
|
||||
char* bval = 0;
|
||||
int err = 0;
|
||||
|
||||
size_t alen = 0;
|
||||
size_t blen = 0;
|
||||
long count = 0;
|
||||
|
||||
err = grib_value_count(a, &count);
|
||||
if (err)
|
||||
return err;
|
||||
alen = count;
|
||||
|
||||
err = grib_value_count(b, &count);
|
||||
if (err)
|
||||
return err;
|
||||
blen = count;
|
||||
|
||||
if (alen != blen)
|
||||
return GRIB_COUNT_MISMATCH;
|
||||
|
||||
aval = (char*)grib_context_malloc(a->context, alen * sizeof(char));
|
||||
bval = (char*)grib_context_malloc(b->context, blen * sizeof(char));
|
||||
|
||||
grib_unpack_string(a, aval, &alen);
|
||||
grib_unpack_string(b, bval, &blen);
|
||||
|
||||
retval = GRIB_SUCCESS;
|
||||
if (strcmp(aval, bval))
|
||||
retval = GRIB_STRING_VALUE_MISMATCH;
|
||||
|
||||
grib_context_free(a->context, aval);
|
||||
grib_context_free(b->context, bval);
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
static long next_offset(grib_accessor* a)
|
||||
{
|
||||
return a->offset + a->length;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,284 @@
|
|||
/*
|
||||
* (C) Copyright 2005- ECMWF.
|
||||
*
|
||||
* This software is licensed under the terms of the Apache Licence Version 2.0
|
||||
* which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
|
||||
*
|
||||
* In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
|
||||
* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
|
||||
*/
|
||||
|
||||
#include "grib_api_internal.h"
|
||||
/*
|
||||
This is used by make_class.pl
|
||||
|
||||
START_CLASS_DEF
|
||||
CLASS = accessor
|
||||
SUPER = grib_accessor_class_gen
|
||||
IMPLEMENTS = unpack_string;pack_string
|
||||
IMPLEMENTS = unpack_long;pack_long
|
||||
IMPLEMENTS = unpack_double;pack_double
|
||||
IMPLEMENTS = init;dump;string_length
|
||||
IMPLEMENTS = value_count
|
||||
IMPLEMENTS = next_offset
|
||||
IMPLEMENTS = get_native_type
|
||||
MEMBERS = const char* key
|
||||
MEMBERS = long start
|
||||
MEMBERS = size_t length
|
||||
END_CLASS_DEF
|
||||
|
||||
*/
|
||||
|
||||
/* START_CLASS_IMP */
|
||||
|
||||
/*
|
||||
|
||||
Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
|
||||
Instead edit values between START_CLASS_DEF and END_CLASS_DEF
|
||||
or edit "accessor.class" and rerun ./make_class.pl
|
||||
|
||||
*/
|
||||
|
||||
static int get_native_type(grib_accessor*);
|
||||
static int pack_double(grib_accessor*, const double* val, size_t* len);
|
||||
static int pack_long(grib_accessor*, const long* val, size_t* len);
|
||||
static int pack_string(grib_accessor*, const char*, size_t* len);
|
||||
static int unpack_double(grib_accessor*, double* val, size_t* len);
|
||||
static int unpack_long(grib_accessor*, long* val, size_t* len);
|
||||
static int unpack_string(grib_accessor*, char*, size_t* len);
|
||||
static size_t string_length(grib_accessor*);
|
||||
static long next_offset(grib_accessor*);
|
||||
static int value_count(grib_accessor*, long*);
|
||||
static void dump(grib_accessor*, grib_dumper*);
|
||||
static void init(grib_accessor*, const long, grib_arguments*);
|
||||
static int compare(grib_accessor*, grib_accessor*);
|
||||
|
||||
typedef struct grib_accessor_to_integer
|
||||
{
|
||||
grib_accessor att;
|
||||
/* Members defined in gen */
|
||||
/* Members defined in to_integer */
|
||||
const char* key;
|
||||
long start;
|
||||
size_t length;
|
||||
} grib_accessor_to_integer;
|
||||
|
||||
extern grib_accessor_class* grib_accessor_class_gen;
|
||||
|
||||
static grib_accessor_class _grib_accessor_class_to_integer = {
|
||||
&grib_accessor_class_gen, /* super */
|
||||
"to_integer", /* name */
|
||||
sizeof(grib_accessor_to_integer), /* size */
|
||||
0, /* inited */
|
||||
0, /* init_class */
|
||||
&init, /* init */
|
||||
0, /* post_init */
|
||||
0, /* destroy */
|
||||
&dump, /* dump */
|
||||
&next_offset, /* next_offset */
|
||||
&string_length, /* get length of string */
|
||||
&value_count, /* get number of values */
|
||||
0, /* get number of bytes */
|
||||
0, /* get offset to bytes */
|
||||
&get_native_type, /* get native type */
|
||||
0, /* get sub_section */
|
||||
0, /* pack_missing */
|
||||
0, /* is_missing */
|
||||
&pack_long, /* pack_long */
|
||||
&unpack_long, /* unpack_long */
|
||||
&pack_double, /* pack_double */
|
||||
0, /* pack_float */
|
||||
&unpack_double, /* unpack_double */
|
||||
0, /* unpack_float */
|
||||
&pack_string, /* pack_string */
|
||||
&unpack_string, /* unpack_string */
|
||||
0, /* pack_string_array */
|
||||
0, /* unpack_string_array */
|
||||
0, /* pack_bytes */
|
||||
0, /* unpack_bytes */
|
||||
0, /* pack_expression */
|
||||
0, /* notify_change */
|
||||
0, /* update_size */
|
||||
0, /* preferred_size */
|
||||
0, /* resize */
|
||||
0, /* nearest_smaller_value */
|
||||
0, /* next accessor */
|
||||
&compare, /* compare vs. another accessor */
|
||||
0, /* unpack only ith value (double) */
|
||||
0, /* unpack only ith value (float) */
|
||||
0, /* unpack a given set of elements (double) */
|
||||
0, /* unpack a given set of elements (float) */
|
||||
0, /* unpack a subarray */
|
||||
0, /* clear */
|
||||
0, /* clone accessor */
|
||||
};
|
||||
|
||||
|
||||
grib_accessor_class* grib_accessor_class_to_integer = &_grib_accessor_class_to_integer;
|
||||
|
||||
/* END_CLASS_IMP */
|
||||
|
||||
static void init(grib_accessor* a, const long len, grib_arguments* arg)
|
||||
{
|
||||
grib_accessor_to_integer* self = (grib_accessor_to_integer*)a;
|
||||
|
||||
self->key = grib_arguments_get_name(grib_handle_of_accessor(a), arg, 0);
|
||||
self->start = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 1);
|
||||
self->length = grib_arguments_get_long(grib_handle_of_accessor(a), arg, 2);
|
||||
|
||||
a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
|
||||
a->length = 0;
|
||||
}
|
||||
|
||||
static int value_count(grib_accessor* a, long* count)
|
||||
{
|
||||
grib_accessor_to_integer* self = (grib_accessor_to_integer*)a;
|
||||
size_t size = 0;
|
||||
|
||||
int err = grib_get_size(grib_handle_of_accessor(a), self->key, &size);
|
||||
*count = size;
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static size_t string_length(grib_accessor* a)
|
||||
{
|
||||
grib_accessor_to_integer* self = (grib_accessor_to_integer*)a;
|
||||
size_t size = 0;
|
||||
|
||||
if (self->length)
|
||||
return self->length;
|
||||
|
||||
grib_get_string_length(grib_handle_of_accessor(a), self->key, &size);
|
||||
return size;
|
||||
}
|
||||
|
||||
static void dump(grib_accessor* a, grib_dumper* dumper)
|
||||
{
|
||||
grib_dump_long(dumper, a, NULL);
|
||||
}
|
||||
|
||||
static int get_native_type(grib_accessor* a)
|
||||
{
|
||||
return GRIB_TYPE_LONG;
|
||||
}
|
||||
|
||||
static int unpack_string(grib_accessor* a, char* val, size_t* len)
|
||||
{
|
||||
int err = 0;
|
||||
grib_accessor_to_integer* self = (grib_accessor_to_integer*)a;
|
||||
char buff[512] = {0,};
|
||||
size_t length;
|
||||
size_t size = 512;
|
||||
|
||||
length = string_length(a);
|
||||
|
||||
if (len[0] < length + 1) {
|
||||
grib_context_log(a->context, GRIB_LOG_ERROR, "unpack_string: Wrong size (%lu) for %s, it contains %ld values",
|
||||
len[0], a->name, a->length + 1);
|
||||
len[0] = 0;
|
||||
return GRIB_ARRAY_TOO_SMALL;
|
||||
}
|
||||
|
||||
err = grib_get_string(grib_handle_of_accessor(a), self->key, buff, &size);
|
||||
if (err)
|
||||
return err;
|
||||
if (length > size) {
|
||||
/*err=GRIB_STRING_TOO_SMALL;*/
|
||||
length = size;
|
||||
}
|
||||
|
||||
memcpy(val, buff + self->start, length);
|
||||
|
||||
val[length] = 0;
|
||||
len[0] = length;
|
||||
return GRIB_SUCCESS;
|
||||
}
|
||||
|
||||
static int pack_string(grib_accessor* a, const char* val, size_t* len)
|
||||
{
|
||||
return GRIB_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static int pack_long(grib_accessor* a, const long* v, size_t* len)
|
||||
{
|
||||
grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack %s as an integer", a->name);
|
||||
return GRIB_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static int pack_double(grib_accessor* a, const double* v, size_t* len)
|
||||
{
|
||||
grib_context_log(a->context, GRIB_LOG_ERROR, "Should not pack %s as a double", a->name);
|
||||
return GRIB_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static int unpack_long(grib_accessor* a, long* v, size_t* len)
|
||||
{
|
||||
char val[1024] = {0,};
|
||||
size_t l = sizeof(val);
|
||||
char* last = NULL;
|
||||
int err = unpack_string(a, val, &l);
|
||||
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
*v = strtol(val, &last, 10);
|
||||
/* if (*last) {err=GRIB_WRONG_CONVERSION;} */
|
||||
|
||||
return GRIB_SUCCESS;
|
||||
}
|
||||
|
||||
static int unpack_double(grib_accessor* a, double* v, size_t* len)
|
||||
{
|
||||
size_t l = 1;
|
||||
long val = 0;
|
||||
int err = unpack_long(a, &val, &l);
|
||||
|
||||
*v = (double)val;
|
||||
return err;
|
||||
}
|
||||
|
||||
static int compare(grib_accessor* a, grib_accessor* b)
|
||||
{
|
||||
int retval = 0;
|
||||
char* aval = 0;
|
||||
char* bval = 0;
|
||||
int err = 0;
|
||||
|
||||
size_t alen = 0;
|
||||
size_t blen = 0;
|
||||
long count = 0;
|
||||
|
||||
err = grib_value_count(a, &count);
|
||||
if (err)
|
||||
return err;
|
||||
alen = count;
|
||||
|
||||
err = grib_value_count(b, &count);
|
||||
if (err)
|
||||
return err;
|
||||
blen = count;
|
||||
|
||||
if (alen != blen)
|
||||
return GRIB_COUNT_MISMATCH;
|
||||
|
||||
aval = (char*)grib_context_malloc(a->context, alen * sizeof(char));
|
||||
bval = (char*)grib_context_malloc(b->context, blen * sizeof(char));
|
||||
|
||||
grib_unpack_string(a, aval, &alen);
|
||||
grib_unpack_string(b, bval, &blen);
|
||||
|
||||
retval = GRIB_SUCCESS;
|
||||
if (strcmp(aval, bval))
|
||||
retval = GRIB_STRING_VALUE_MISMATCH;
|
||||
|
||||
grib_context_free(a->context, aval);
|
||||
grib_context_free(b->context, bval);
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
static long next_offset(grib_accessor* a)
|
||||
{
|
||||
return a->offset + a->length;
|
||||
}
|
||||
|
|
@ -174,44 +174,41 @@ static int evaluate_long(grib_expression* g, grib_handle* h, long* result)
|
|||
|
||||
static int evaluate_double(grib_expression* g, grib_handle* h, double* result)
|
||||
{
|
||||
grib_expression_is_in_dict* e = (grib_expression_is_in_dict*)g;
|
||||
int err = 0;
|
||||
char mybuf[1024] = {0,};
|
||||
size_t size = 1024;
|
||||
return GRIB_NOT_IMPLEMENTED;
|
||||
|
||||
grib_trie* list = load_dictionary(h->context, g, &err);
|
||||
|
||||
if ((err = grib_get_string_internal(h, e->key, mybuf, &size)) != GRIB_SUCCESS)
|
||||
return err;
|
||||
|
||||
if (grib_trie_get(list, mybuf))
|
||||
*result = 1;
|
||||
else
|
||||
*result = 0;
|
||||
|
||||
return err;
|
||||
// grib_expression_is_in_dict* e = (grib_expression_is_in_dict*)g;
|
||||
// int err = 0;
|
||||
// char mybuf[1024] = {0,};
|
||||
// size_t size = 1024;
|
||||
// grib_trie* list = load_dictionary(h->context, g, &err);
|
||||
// if ((err = grib_get_string_internal(h, e->key, mybuf, &size)) != GRIB_SUCCESS)
|
||||
// return err;
|
||||
// if (grib_trie_get(list, mybuf))
|
||||
// *result = 1;
|
||||
// else
|
||||
// *result = 0;
|
||||
// return err;
|
||||
}
|
||||
|
||||
static string evaluate_string(grib_expression* g, grib_handle* h, char* buf, size_t* size, int* err)
|
||||
{
|
||||
grib_expression_is_in_dict* e = (grib_expression_is_in_dict*)g;
|
||||
char mybuf[1024] = {0,};
|
||||
size_t sizebuf = 1024;
|
||||
long result;
|
||||
*err = GRIB_NOT_IMPLEMENTED;
|
||||
return NULL;
|
||||
|
||||
grib_trie* list = load_dictionary(h->context, g, err);
|
||||
|
||||
if ((*err = grib_get_string_internal(h, e->key, mybuf, &sizebuf)) != GRIB_SUCCESS)
|
||||
return NULL;
|
||||
|
||||
if (grib_trie_get(list, mybuf))
|
||||
result = 1;
|
||||
else
|
||||
result = 0;
|
||||
|
||||
snprintf(buf, 32, "%ld", result);
|
||||
*size = strlen(buf);
|
||||
return buf;
|
||||
// grib_expression_is_in_dict* e = (grib_expression_is_in_dict*)g;
|
||||
// char mybuf[1024] = {0,};
|
||||
// size_t sizebuf = 1024;
|
||||
// long result;
|
||||
// grib_trie* list = load_dictionary(h->context, g, err);
|
||||
// if ((*err = grib_get_string_internal(h, e->key, mybuf, &sizebuf)) != GRIB_SUCCESS)
|
||||
// return NULL;
|
||||
// if (grib_trie_get(list, mybuf))
|
||||
// result = 1;
|
||||
// else
|
||||
// result = 0;
|
||||
// snprintf(buf, 32, "%ld", result);
|
||||
// *size = strlen(buf);
|
||||
// return buf;
|
||||
}
|
||||
|
||||
static void print(grib_context* c, grib_expression* g, grib_handle* f)
|
||||
|
|
|
|||
Loading…
Reference in New Issue