diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 759fcf361..193763ec8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -396,8 +396,7 @@ list( APPEND eccodes_extra_src_files grib_bits_fast_big_endian_omp.cc grib_bits_any_endian_omp.cc encode_double_array.cc grib_bits_ibmpow.cc - grib_bits_ibmpow_opt.cc - minmax_val.cc ) + grib_bits_ibmpow_opt.cc ) list( APPEND eccodes_src_files cpp/eccodes/accessor/Accessor.cc diff --git a/src/accessor.class b/src/accessor.class index 9981e35cb..dd3853061 100644 --- a/src/accessor.class +++ b/src/accessor.class @@ -102,9 +102,3 @@ grib_accessor_class* grib_accessor_class_NAME = &_grib_accessor_class_NAME; ADD_TO_FILE grib_accessor_class.h extern grib_accessor_class* grib_accessor_class_NAME; ADD_TO_FILE grib_accessor_factory.h { "NAME", &grib_accessor_class_NAME, }, ADD_TO_FILE grib_accessor_factory_hash_list NAME, &grib_accessor_class_NAME - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - diff --git a/src/action.class b/src/action.class index 5f82e6ab1..772c328c6 100644 --- a/src/action.class +++ b/src/action.class @@ -10,7 +10,7 @@ static int execute(grib_action* a,grib_handle* h); typedef struct grib_action_NAME { - grib_action act; + grib_action act; MEMBERS } grib_action_NAME; diff --git a/src/action_class_set_iarray.cc b/src/action_class_set_iarray.cc index 5862cef86..e5e83d291 100644 --- a/src/action_class_set_iarray.cc +++ b/src/action_class_set_iarray.cc @@ -55,9 +55,12 @@ static grib_action_class _grib_action_class_set_iarray = { &init_class, /* init_class */ 0, /* init */ &destroy, /* destroy */ + &dump, /* dump */ &xref, /* xref */ + 0, /* create_accessor*/ + 0, /* notify_change */ 0, /* reparse */ &execute, /* execute */ diff --git a/src/deprecated/jgribapi_GribFile.h b/src/deprecated/jgribapi_GribFile.h deleted file mode 100644 index 580118d80..000000000 --- a/src/deprecated/jgribapi_GribFile.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * (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. - */ - -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class jgribapi_GribFile */ - -#ifndef _Included_jgribapi_GribFile -#define _Included_jgribapi_GribFile -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: jgribapi_GribFile - * Method: gribGetNextHandle - * Signature: (J)Ljgribapi/GribHandle; - */ -JNIEXPORT jobject JNICALL Java_jgribapi_GribFile_gribGetNextHandle(JNIEnv*, jobject, jlong); - -/* - * Class: jgribapi_GribFile - * Method: gribEOFReached - * Signature: (J)J - */ -JNIEXPORT jlong JNICALL Java_jgribapi_GribFile_gribEOFReached(JNIEnv*, jobject, jlong); - -/* - * Class: jgribapi_GribFile - * Method: gribGetGribFile - * Signature: (Ljava/lang/String;)J - */ -JNIEXPORT jlong JNICALL Java_jgribapi_GribFile_gribGetGribFile(JNIEnv*, jobject, jstring); - -/* - * Class: jgribapi_GribFile - * Method: gribCloseFile - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_jgribapi_GribFile_gribCloseFile(JNIEnv*, jobject, jlong); - -/* - * Class: jgribapi_GribFile - * Method: gribNewFile - * Signature: (Ljava/lang/String;)J - */ -JNIEXPORT jlong JNICALL Java_jgribapi_GribFile_gribNewFile(JNIEnv*, jobject, jstring); - -/* - * Class: jgribapi_GribFile - * Method: gribWriteHandle - * Signature: (JJ)V - */ -JNIEXPORT void JNICALL Java_jgribapi_GribFile_gribWriteHandle(JNIEnv*, jobject, jlong, jlong); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/deprecated/jgribapi_GribHandle.h b/src/deprecated/jgribapi_GribHandle.h deleted file mode 100644 index 668ea4f1f..000000000 --- a/src/deprecated/jgribapi_GribHandle.h +++ /dev/null @@ -1,156 +0,0 @@ -/* - * (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. - */ - -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class jgribapi_GribHandle */ - -#ifndef _Included_jgribapi_GribHandle -#define _Included_jgribapi_GribHandle -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: jgribapi_GribHandle - * Method: getIteratorID - * Signature: (J)J - */ -JNIEXPORT jlong JNICALL Java_jgribapi_GribHandle_getIteratorID(JNIEnv*, jobject, jlong); - -/* - * Class: jgribapi_GribHandle - * Method: gribGetString - * Signature: (JLjava/lang/String;)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_jgribapi_GribHandle_gribGetString(JNIEnv*, jobject, jlong, jstring); - -/* - * Class: jgribapi_GribHandle - * Method: gribGetLong - * Signature: (JLjava/lang/String;)J - */ -JNIEXPORT jlong JNICALL Java_jgribapi_GribHandle_gribGetLong(JNIEnv*, jobject, jlong, jstring); - -/* - * Class: jgribapi_GribHandle - * Method: gribGetDouble - * Signature: (JLjava/lang/String;)D - */ -JNIEXPORT jdouble JNICALL Java_jgribapi_GribHandle_gribGetDouble(JNIEnv*, jobject, jlong, jstring); - -/* - * Class: jgribapi_GribHandle - * Method: gribGetLongArray - * Signature: (JLjava/lang/String;)[J - */ -JNIEXPORT jlongArray JNICALL Java_jgribapi_GribHandle_gribGetLongArray(JNIEnv*, jobject, jlong, jstring); - -/* - * Class: jgribapi_GribHandle - * Method: gribGetDoubleArray - * Signature: (JLjava/lang/String;)[D - */ -JNIEXPORT jdoubleArray JNICALL Java_jgribapi_GribHandle_gribGetDoubleArray(JNIEnv*, jobject, jlong, jstring); - -/* - * Class: jgribapi_GribHandle - * Method: gribSetString - * Signature: (JLjava/lang/String;Ljava/lang/String;)I - */ -JNIEXPORT jint JNICALL Java_jgribapi_GribHandle_gribSetString(JNIEnv*, jobject, jlong, jstring, jstring); - -/* - * Class: jgribapi_GribHandle - * Method: gribCreateNext - * Signature: (J)Ljgribapi/GribKey; - */ -JNIEXPORT jobject JNICALL Java_jgribapi_GribHandle_gribCreateNext(JNIEnv*, jobject, jlong); - -/* - * Class: jgribapi_GribHandle - * Method: gribSetSearch - * Signature: (JLjava/lang/String;)J - */ -JNIEXPORT jlong JNICALL Java_jgribapi_GribHandle_gribSetSearch(JNIEnv*, jobject, jlong, jstring); - -/* - * Class: jgribapi_GribHandle - * Method: gribSetLong - * Signature: (JLjava/lang/String;J)I - */ -JNIEXPORT jint JNICALL Java_jgribapi_GribHandle_gribSetLong(JNIEnv*, jobject, jlong, jstring, jlong); - -/* - * Class: jgribapi_GribHandle - * Method: gribSetDouble - * Signature: (JLjava/lang/String;D)I - */ -JNIEXPORT jint JNICALL Java_jgribapi_GribHandle_gribSetDouble(JNIEnv*, jobject, jlong, jstring, jdouble); - -/* - * Class: jgribapi_GribHandle - * Method: gribSetLongArray - * Signature: (JLjava/lang/String;[J)I - */ -JNIEXPORT jint JNICALL Java_jgribapi_GribHandle_gribSetLongArray(JNIEnv*, jobject, jlong, jstring, jlongArray); - -/* - * Class: jgribapi_GribHandle - * Method: gribSetDoubleArray - * Signature: (JLjava/lang/String;[D)I - */ -JNIEXPORT jint JNICALL Java_jgribapi_GribHandle_gribSetDoubleArray(JNIEnv*, jobject, jlong, jstring, jdoubleArray); - -/* - * Class: jgribapi_GribHandle - * Method: gribGetXml - * Signature: (J)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_jgribapi_GribHandle_gribGetXml__J(JNIEnv*, jobject, jlong); - -/* - * Class: jgribapi_GribHandle - * Method: gribGetXml - * Signature: (JLjava/lang/String;)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_jgribapi_GribHandle_gribGetXml__JLjava_lang_String_2(JNIEnv*, jobject, jlong, jstring); - -/* - * Class: jgribapi_GribHandle - * Method: gribGetAscii - * Signature: (JLjava/lang/String;)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_jgribapi_GribHandle_gribGetAscii(JNIEnv*, jobject, jlong, jstring); - -/* - * Class: jgribapi_GribHandle - * Method: gribGetBytes - * Signature: (JLjava/lang/String;)[B - */ -JNIEXPORT jbyteArray JNICALL Java_jgribapi_GribHandle_gribGetBytes(JNIEnv*, jobject, jlong, jstring); - -/* - * Class: jgribapi_GribHandle - * Method: gribDeleteHandle - * Signature: (J)I - */ -JNIEXPORT jint JNICALL Java_jgribapi_GribHandle_gribDeleteHandle(JNIEnv*, jobject, jlong); - -/* - * Class: jgribapi_GribHandle - * Method: gribResetHandle - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_jgribapi_GribHandle_gribResetHandle(JNIEnv*, jobject, jlong); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/deprecated/jgribapi_GribIterator.h b/src/deprecated/jgribapi_GribIterator.h deleted file mode 100644 index fcbad5b7b..000000000 --- a/src/deprecated/jgribapi_GribIterator.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * (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. - */ - -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class jgribapi_GribIterator */ - -#ifndef _Included_jgribapi_GribIterator -#define _Included_jgribapi_GribIterator -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: jgribapi_GribIterator - * Method: gribIteratorGetNext - * Signature: (J)Ljgribapi/GribPoint; - */ -JNIEXPORT jobject JNICALL Java_jgribapi_GribIterator_gribIteratorGetNext(JNIEnv*, jobject, jlong); - -/* - * Class: jgribapi_GribIterator - * Method: gribIteratorHasNext - * Signature: (J)J - */ -JNIEXPORT jlong JNICALL Java_jgribapi_GribIterator_gribIteratorHasNext(JNIEnv*, jobject, jlong); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/deprecated/md5.grib_md5_flush.cc b/src/deprecated/md5.grib_md5_flush.cc new file mode 100644 index 000000000..525387bd5 --- /dev/null +++ b/src/deprecated/md5.grib_md5_flush.cc @@ -0,0 +1,178 @@ +#define ROT(x, c) ((x << c) | (x >> (32 - c))) + +#define ECC_F(x, y, z) ((x & y) | ((~x) & z)) +#define ECC_G(x, y, z) ((x & z) | (y & (~z))) +#define ECC_H(x, y, z) (x ^ y ^ z) +#define ECC_I(x, y, z) (y ^ (x | (~z))) + +#define F_(A, B, C, D, g, i) \ + A += ECC_F(B, C, D) + w[g] + k[i]; \ + A &= 0xffffffff; \ + A = ROT(A, r[i]); \ + A += B; +#define G_(A, B, C, D, g, i) \ + A += ECC_G(B, C, D) + w[g] + k[i]; \ + A &= 0xffffffff; \ + A = ROT(A, r[i]); \ + A += B; +#define H_(A, B, C, D, g, i) \ + A += ECC_H(B, C, D) + w[g] + k[i]; \ + A &= 0xffffffff; \ + A = ROT(A, r[i]); \ + A += B; +#define I_(A, B, C, D, g, i) \ + A += ECC_I(B, C, D) + w[g] + k[i]; \ + A &= 0xffffffff; \ + A = ROT(A, r[i]); \ + A += B; + +static void grib_md5_flush(grib_md5_state* s) +{ +#if 1 + unsigned long a = s->h0; + unsigned long b = s->h1; + unsigned long c = s->h2; + unsigned long d = s->h3; + unsigned long* w = &s->words[0]; + + F_(a, b, c, d, 0, 0); + F_(d, a, b, c, 1, 1); + F_(c, d, a, b, 2, 2); + F_(b, c, d, a, 3, 3); + + F_(a, b, c, d, 4, 4); + F_(d, a, b, c, 5, 5); + F_(c, d, a, b, 6, 6); + F_(b, c, d, a, 7, 7); + + F_(a, b, c, d, 8, 8); + F_(d, a, b, c, 9, 9); + F_(c, d, a, b, 10, 10); + F_(b, c, d, a, 11, 11); + + F_(a, b, c, d, 12, 12); + F_(d, a, b, c, 13, 13); + F_(c, d, a, b, 14, 14); + F_(b, c, d, a, 15, 15); + + G_(a, b, c, d, 1, 16); + G_(d, a, b, c, 6, 17); + G_(c, d, a, b, 11, 18); + G_(b, c, d, a, 0, 19); + + G_(a, b, c, d, 5, 20); + G_(d, a, b, c, 10, 21); + G_(c, d, a, b, 15, 22); + G_(b, c, d, a, 4, 23); + + G_(a, b, c, d, 9, 24); + G_(d, a, b, c, 14, 25); + G_(c, d, a, b, 3, 26); + G_(b, c, d, a, 8, 27); + + G_(a, b, c, d, 13, 28); + G_(d, a, b, c, 2, 29); + G_(c, d, a, b, 7, 30); + G_(b, c, d, a, 12, 31); + + H_(a, b, c, d, 5, 32); + H_(d, a, b, c, 8, 33); + H_(c, d, a, b, 11, 34); + H_(b, c, d, a, 14, 35); + + H_(a, b, c, d, 1, 36); + H_(d, a, b, c, 4, 37); + H_(c, d, a, b, 7, 38); + H_(b, c, d, a, 10, 39); + + H_(a, b, c, d, 13, 40); + H_(d, a, b, c, 0, 41); + H_(c, d, a, b, 3, 42); + H_(b, c, d, a, 6, 43); + + H_(a, b, c, d, 9, 44); + H_(d, a, b, c, 12, 45); + H_(c, d, a, b, 15, 46); + H_(b, c, d, a, 2, 47); + + I_(a, b, c, d, 0, 48); + I_(d, a, b, c, 7, 49); + I_(c, d, a, b, 14, 50); + I_(b, c, d, a, 5, 51); + + I_(a, b, c, d, 12, 52); + I_(d, a, b, c, 3, 53); + I_(c, d, a, b, 10, 54); + I_(b, c, d, a, 1, 55); + + I_(a, b, c, d, 8, 56); + I_(d, a, b, c, 15, 57); + I_(c, d, a, b, 6, 58); + I_(b, c, d, a, 13, 59); + + I_(a, b, c, d, 4, 60); + I_(d, a, b, c, 11, 61); + I_(c, d, a, b, 2, 62); + I_(b, c, d, a, 9, 63); + +#else + unsigned long i, g; + unsigned long a = s->h0; + unsigned long b = s->h1; + unsigned long c = s->h2; + unsigned long d = s->h3; + unsigned long f; + unsigned long temp; + unsigned long* w = &s->words[0]; + unsigned long h; + for (i = 0; i < 16; i++) { + f = F(b, c, d); + g = i; + temp = d; + d = c; + c = b; + h = a + f + k[i] + w[g]; + b = b + rotate(h, r[i]); + a = temp; + } + + for (i = 16; i < 32; i++) { + f = G(b, c, d); + g = (5 * i + 1) % 16; + temp = d; + d = c; + c = b; + h = a + f + k[i] + w[g]; + b = b + rotate(h, r[i]); + a = temp; + } + for (i = 32; i < 48; i++) { + f = H(b, c, d); + g = (3 * i + 5) % 16; + temp = d; + d = c; + c = b; + h = a + f + k[i] + w[g]; + b = b + rotate(h, r[i]); + a = temp; + } + for (i = 48; i < 64; i++) { + f = I(b, c, d); + g = (7 * i) % 16; + temp = d; + d = c; + c = b; + h = a + f + k[i] + w[g]; + b = b + rotate(h, r[i]); + a = temp; + } + +#endif + + s->h0 += a; + s->h1 += b; + s->h2 += c; + s->h3 += d; + + s->word_count = 0; +} diff --git a/src/minmax_val.cc b/src/deprecated/minmax_val.cc similarity index 100% rename from src/minmax_val.cc rename to src/deprecated/minmax_val.cc diff --git a/src/dumper.class b/src/dumper.class index e0c879c68..62bc265db 100644 --- a/src/dumper.class +++ b/src/dumper.class @@ -14,8 +14,8 @@ static void header (grib_dumper*,grib_handle*); static void footer (grib_dumper*,grib_handle*); typedef struct grib_dumper_NAME { - grib_dumper dumper; -MEMBERS + grib_dumper dumper; +MEMBERS } grib_dumper_NAME; extern grib_dumper_class* SUPER; diff --git a/src/eccodes_prototypes.h b/src/eccodes_prototypes.h index ff623067c..76960b58e 100644 --- a/src/eccodes_prototypes.h +++ b/src/eccodes_prototypes.h @@ -493,8 +493,6 @@ int grib_g1_step_get_steps(grib_accessor* a, long* start, long* theEnd); /* grib_accessor_class_ieeefloat.cc*/ /* grib_accessor_class_constant.cc*/ -void accessor_constant_set_type(grib_accessor* a, int type); -void accessor_constant_set_dval(grib_accessor* a, double dval); /* grib_accessor_class_iterator.cc*/ grib_iterator* grib_iterator_new(const grib_handle* h, unsigned long flags, int* error); diff --git a/src/expression.class b/src/expression.class index ccd113b4c..9c11d39db 100644 --- a/src/expression.class +++ b/src/expression.class @@ -26,20 +26,18 @@ extern grib_expression_class* SUPER; static grib_expression_class _grib_expression_class_NAME = { &SUPER, /* super */ "NAME", /* name */ - sizeof(grib_expression_NAME),/* size of instance */ + sizeof(grib_expression_NAME),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ &init, /* constructor */ &destroy, /* destructor */ - &print, - &add_dependency, - - &native_type, - &get_name, - - &evaluate_long, - &evaluate_double, - &evaluate_string, + &print, + &add_dependency, + &native_type, + &get_name, + &evaluate_long, + &evaluate_double, + &evaluate_string, }; grib_expression_class* grib_expression_class_NAME = &_grib_expression_class_NAME; diff --git a/src/grib_accessor_class_abstract_long_vector.cc b/src/grib_accessor_class_abstract_long_vector.cc index efdabab47..e62eb9bfc 100644 --- a/src/grib_accessor_class_abstract_long_vector.cc +++ b/src/grib_accessor_class_abstract_long_vector.cc @@ -101,10 +101,4 @@ static grib_accessor_class _grib_accessor_class_abstract_long_vector = { grib_accessor_class* grib_accessor_class_abstract_long_vector = &_grib_accessor_class_abstract_long_vector; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_abstract_vector.cc b/src/grib_accessor_class_abstract_vector.cc index 025d9123d..afdd17da8 100644 --- a/src/grib_accessor_class_abstract_vector.cc +++ b/src/grib_accessor_class_abstract_vector.cc @@ -96,10 +96,4 @@ static grib_accessor_class _grib_accessor_class_abstract_vector = { grib_accessor_class* grib_accessor_class_abstract_vector = &_grib_accessor_class_abstract_vector; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_array.cc b/src/grib_accessor_class_array.cc index dc77ee9f8..9898133d7 100644 --- a/src/grib_accessor_class_array.cc +++ b/src/grib_accessor_class_array.cc @@ -101,12 +101,6 @@ static grib_accessor_class _grib_accessor_class_array = { grib_accessor_class* grib_accessor_class_array = &_grib_accessor_class_array; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_ascii.cc b/src/grib_accessor_class_ascii.cc index 210e8941b..e6d85d600 100644 --- a/src/grib_accessor_class_ascii.cc +++ b/src/grib_accessor_class_ascii.cc @@ -113,12 +113,6 @@ static grib_accessor_class _grib_accessor_class_ascii = { grib_accessor_class* grib_accessor_class_ascii = &_grib_accessor_class_ascii; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_assert.cc b/src/grib_accessor_class_assert.cc index 8e9ff7696..69e25a002 100644 --- a/src/grib_accessor_class_assert.cc +++ b/src/grib_accessor_class_assert.cc @@ -101,12 +101,6 @@ static grib_accessor_class _grib_accessor_class_assert = { grib_accessor_class* grib_accessor_class_assert = &_grib_accessor_class_assert; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_bit.cc b/src/grib_accessor_class_bit.cc index 7572e68c1..012632bbb 100644 --- a/src/grib_accessor_class_bit.cc +++ b/src/grib_accessor_class_bit.cc @@ -103,12 +103,6 @@ static grib_accessor_class _grib_accessor_class_bit = { grib_accessor_class* grib_accessor_class_bit = &_grib_accessor_class_bit; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_bitmap.cc b/src/grib_accessor_class_bitmap.cc index 3df27398a..b468234bc 100644 --- a/src/grib_accessor_class_bitmap.cc +++ b/src/grib_accessor_class_bitmap.cc @@ -119,12 +119,6 @@ static grib_accessor_class _grib_accessor_class_bitmap = { grib_accessor_class* grib_accessor_class_bitmap = &_grib_accessor_class_bitmap; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_bits.cc b/src/grib_accessor_class_bits.cc index bb291b439..7b0979bb6 100644 --- a/src/grib_accessor_class_bits.cc +++ b/src/grib_accessor_class_bits.cc @@ -125,12 +125,6 @@ static grib_accessor_class _grib_accessor_class_bits = { grib_accessor_class* grib_accessor_class_bits = &_grib_accessor_class_bits; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_bits_per_value.cc b/src/grib_accessor_class_bits_per_value.cc index 60301badd..66b323c53 100644 --- a/src/grib_accessor_class_bits_per_value.cc +++ b/src/grib_accessor_class_bits_per_value.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_bits_per_value = { grib_accessor_class* grib_accessor_class_bits_per_value = &_grib_accessor_class_bits_per_value; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* args) diff --git a/src/grib_accessor_class_blob.cc b/src/grib_accessor_class_blob.cc index ffd13c700..e889173b6 100644 --- a/src/grib_accessor_class_blob.cc +++ b/src/grib_accessor_class_blob.cc @@ -97,12 +97,6 @@ static grib_accessor_class _grib_accessor_class_blob = { grib_accessor_class* grib_accessor_class_blob = &_grib_accessor_class_blob; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_budgdate.cc b/src/grib_accessor_class_budgdate.cc index effa6e8df..45bb10b97 100644 --- a/src/grib_accessor_class_budgdate.cc +++ b/src/grib_accessor_class_budgdate.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_budgdate = { grib_accessor_class* grib_accessor_class_budgdate = &_grib_accessor_class_budgdate; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_bufr_data_array.cc b/src/grib_accessor_class_bufr_data_array.cc index 1a3354c23..e4ac05852 100644 --- a/src/grib_accessor_class_bufr_data_array.cc +++ b/src/grib_accessor_class_bufr_data_array.cc @@ -208,12 +208,6 @@ static grib_accessor_class _grib_accessor_class_bufr_data_array = { grib_accessor_class* grib_accessor_class_bufr_data_array = &_grib_accessor_class_bufr_data_array; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ #define MAX_NESTED_REPLICATIONS 8 @@ -2503,8 +2497,8 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset section = gaGroup->sub_section; /*rootSection=section;*/ /*sectionUp=self->dataKeys;*/ - accessor_constant_set_type(gaGroup, GRIB_TYPE_LONG); - accessor_constant_set_dval(gaGroup, groupNumber); + //accessor_constant_set_type(gaGroup, GRIB_TYPE_LONG); + //accessor_constant_set_dval(gaGroup, groupNumber); /* ECC-765: Don't empty out the section_4 keys otherwise there will be memory leaks. */ /* Setting first and last to zero effectively masks out those section 4 keys! */ /* self->dataKeys->block->first=0; */ @@ -2566,8 +2560,8 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset gaGroup->sub_section = grib_section_create(hand, gaGroup); gaGroup->bufr_group_number = groupNumber; - accessor_constant_set_type(gaGroup, GRIB_TYPE_LONG); - accessor_constant_set_dval(gaGroup, groupNumber); + //accessor_constant_set_type(gaGroup, GRIB_TYPE_LONG); + //accessor_constant_set_dval(gaGroup, groupNumber); grib_push_accessor(gaGroup, groupSection->block); section = gaGroup->sub_section; @@ -2610,8 +2604,8 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset gaGroup = grib_accessor_factory(groupSection, &creatorGroup, 0, NULL); gaGroup->sub_section = grib_section_create(hand, gaGroup); gaGroup->bufr_group_number = groupNumber; - accessor_constant_set_type(gaGroup, GRIB_TYPE_LONG); - accessor_constant_set_dval(gaGroup, groupNumber); + //accessor_constant_set_type(gaGroup, GRIB_TYPE_LONG); + //accessor_constant_set_dval(gaGroup, groupNumber); grib_push_accessor(gaGroup, groupSection->block); section = gaGroup->sub_section; diff --git a/src/grib_accessor_class_bufr_data_element.cc b/src/grib_accessor_class_bufr_data_element.cc index 1fc97d9a5..45dd15f7d 100644 --- a/src/grib_accessor_class_bufr_data_element.cc +++ b/src/grib_accessor_class_bufr_data_element.cc @@ -139,12 +139,6 @@ static grib_accessor_class _grib_accessor_class_bufr_data_element = { grib_accessor_class* grib_accessor_class_bufr_data_element = &_grib_accessor_class_bufr_data_element; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static grib_accessor* make_clone(grib_accessor* a, grib_section* s, int* err) diff --git a/src/grib_accessor_class_bufr_elements_table.cc b/src/grib_accessor_class_bufr_elements_table.cc index 4089082f9..0565a8489 100644 --- a/src/grib_accessor_class_bufr_elements_table.cc +++ b/src/grib_accessor_class_bufr_elements_table.cc @@ -139,12 +139,6 @@ static grib_accessor_class _grib_accessor_class_bufr_elements_table = { grib_accessor_class* grib_accessor_class_bufr_elements_table = &_grib_accessor_class_bufr_elements_table; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* params) diff --git a/src/grib_accessor_class_bufr_extract_area_subsets.cc b/src/grib_accessor_class_bufr_extract_area_subsets.cc index a7519615c..7fd1d70be 100644 --- a/src/grib_accessor_class_bufr_extract_area_subsets.cc +++ b/src/grib_accessor_class_bufr_extract_area_subsets.cc @@ -116,12 +116,6 @@ static grib_accessor_class _grib_accessor_class_bufr_extract_area_subsets = { grib_accessor_class* grib_accessor_class_bufr_extract_area_subsets = &_grib_accessor_class_bufr_extract_area_subsets; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_bufr_extract_datetime_subsets.cc b/src/grib_accessor_class_bufr_extract_datetime_subsets.cc index b9daf0de0..46792a76a 100644 --- a/src/grib_accessor_class_bufr_extract_datetime_subsets.cc +++ b/src/grib_accessor_class_bufr_extract_datetime_subsets.cc @@ -102,12 +102,6 @@ static grib_accessor_class _grib_accessor_class_bufr_extract_datetime_subsets = grib_accessor_class* grib_accessor_class_bufr_extract_datetime_subsets = &_grib_accessor_class_bufr_extract_datetime_subsets; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_bufr_extract_subsets.cc b/src/grib_accessor_class_bufr_extract_subsets.cc index 673c2b36d..969a8b59f 100644 --- a/src/grib_accessor_class_bufr_extract_subsets.cc +++ b/src/grib_accessor_class_bufr_extract_subsets.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_bufr_extract_subsets = { grib_accessor_class* grib_accessor_class_bufr_extract_subsets = &_grib_accessor_class_bufr_extract_subsets; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void get_accessors(grib_accessor* a) diff --git a/src/grib_accessor_class_bufr_group.cc b/src/grib_accessor_class_bufr_group.cc index bffa53fe6..216cf308c 100644 --- a/src/grib_accessor_class_bufr_group.cc +++ b/src/grib_accessor_class_bufr_group.cc @@ -100,12 +100,6 @@ static grib_accessor_class _grib_accessor_class_bufr_group = { grib_accessor_class* grib_accessor_class_bufr_group = &_grib_accessor_class_bufr_group; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void dump(grib_accessor* a, grib_dumper* dumper) diff --git a/src/grib_accessor_class_bufr_simple_thinning.cc b/src/grib_accessor_class_bufr_simple_thinning.cc index 17404fa6d..96f9d5f0d 100644 --- a/src/grib_accessor_class_bufr_simple_thinning.cc +++ b/src/grib_accessor_class_bufr_simple_thinning.cc @@ -108,12 +108,6 @@ static grib_accessor_class _grib_accessor_class_bufr_simple_thinning = { grib_accessor_class* grib_accessor_class_bufr_simple_thinning = &_grib_accessor_class_bufr_simple_thinning; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_bufr_string_values.cc b/src/grib_accessor_class_bufr_string_values.cc index a7e8a9690..541279332 100644 --- a/src/grib_accessor_class_bufr_string_values.cc +++ b/src/grib_accessor_class_bufr_string_values.cc @@ -116,12 +116,6 @@ static grib_accessor_class _grib_accessor_class_bufr_string_values = { grib_accessor_class* grib_accessor_class_bufr_string_values = &_grib_accessor_class_bufr_string_values; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* args) diff --git a/src/grib_accessor_class_bufrdc_expanded_descriptors.cc b/src/grib_accessor_class_bufrdc_expanded_descriptors.cc index a887154ff..590c41860 100644 --- a/src/grib_accessor_class_bufrdc_expanded_descriptors.cc +++ b/src/grib_accessor_class_bufrdc_expanded_descriptors.cc @@ -114,12 +114,6 @@ static grib_accessor_class _grib_accessor_class_bufrdc_expanded_descriptors = { grib_accessor_class* grib_accessor_class_bufrdc_expanded_descriptors = &_grib_accessor_class_bufrdc_expanded_descriptors; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* args) diff --git a/src/grib_accessor_class_bytes.cc b/src/grib_accessor_class_bytes.cc index c8499ecfd..8e8440815 100644 --- a/src/grib_accessor_class_bytes.cc +++ b/src/grib_accessor_class_bytes.cc @@ -98,12 +98,6 @@ static grib_accessor_class _grib_accessor_class_bytes = { grib_accessor_class* grib_accessor_class_bytes = &_grib_accessor_class_bytes; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_change_alternative_row_scanning.cc b/src/grib_accessor_class_change_alternative_row_scanning.cc index d4c2056c9..548264158 100644 --- a/src/grib_accessor_class_change_alternative_row_scanning.cc +++ b/src/grib_accessor_class_change_alternative_row_scanning.cc @@ -106,12 +106,6 @@ static grib_accessor_class _grib_accessor_class_change_alternative_row_scanning grib_accessor_class* grib_accessor_class_change_alternative_row_scanning = &_grib_accessor_class_change_alternative_row_scanning; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* args) diff --git a/src/grib_accessor_class_change_scanning_direction.cc b/src/grib_accessor_class_change_scanning_direction.cc index 078529963..85a518718 100644 --- a/src/grib_accessor_class_change_scanning_direction.cc +++ b/src/grib_accessor_class_change_scanning_direction.cc @@ -114,12 +114,6 @@ static grib_accessor_class _grib_accessor_class_change_scanning_direction = { grib_accessor_class* grib_accessor_class_change_scanning_direction = &_grib_accessor_class_change_scanning_direction; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* args) diff --git a/src/grib_accessor_class_check_internal_version.cc b/src/grib_accessor_class_check_internal_version.cc index 91794ab1d..04f281cbb 100644 --- a/src/grib_accessor_class_check_internal_version.cc +++ b/src/grib_accessor_class_check_internal_version.cc @@ -97,12 +97,6 @@ static grib_accessor_class _grib_accessor_class_check_internal_version = { grib_accessor_class* grib_accessor_class_check_internal_version = &_grib_accessor_class_check_internal_version; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ /* This is the internal engine version number */ diff --git a/src/grib_accessor_class_closest_date.cc b/src/grib_accessor_class_closest_date.cc index fd1b68ae4..d898fa604 100644 --- a/src/grib_accessor_class_closest_date.cc +++ b/src/grib_accessor_class_closest_date.cc @@ -120,12 +120,6 @@ static grib_accessor_class _grib_accessor_class_closest_date = { grib_accessor_class* grib_accessor_class_closest_date = &_grib_accessor_class_closest_date; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_codeflag.cc b/src/grib_accessor_class_codeflag.cc index 93f33fb14..75570cc28 100644 --- a/src/grib_accessor_class_codeflag.cc +++ b/src/grib_accessor_class_codeflag.cc @@ -106,12 +106,6 @@ static grib_accessor_class _grib_accessor_class_codeflag = { grib_accessor_class* grib_accessor_class_codeflag = &_grib_accessor_class_codeflag; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* param) diff --git a/src/grib_accessor_class_codetable.cc b/src/grib_accessor_class_codetable.cc index 7cc66d775..363fb9f17 100644 --- a/src/grib_accessor_class_codetable.cc +++ b/src/grib_accessor_class_codetable.cc @@ -150,12 +150,6 @@ static grib_accessor_class _grib_accessor_class_codetable = { grib_accessor_class* grib_accessor_class_codetable = &_grib_accessor_class_codetable; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int grib_load_codetable(grib_context* c, const char* filename, const char* recomposed_name, size_t size, grib_codetable* t); @@ -612,11 +606,7 @@ static int unpack_string(grib_accessor* a, char* buffer, size_t* len) strcpy(tmp, table->entries[value].abbreviation); } else { -#if 1 snprintf(tmp, sizeof(tmp), "%d", (int)value); -#else - return GRIB_DECODING_ERROR; -#endif } l = strlen(tmp) + 1; diff --git a/src/grib_accessor_class_codetable_title.cc b/src/grib_accessor_class_codetable_title.cc index d7ef6a6bc..0a80a0f31 100644 --- a/src/grib_accessor_class_codetable_title.cc +++ b/src/grib_accessor_class_codetable_title.cc @@ -98,12 +98,6 @@ static grib_accessor_class _grib_accessor_class_codetable_title = { grib_accessor_class* grib_accessor_class_codetable_title = &_grib_accessor_class_codetable_title; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ typedef struct grib_accessor_codetable @@ -157,11 +151,7 @@ static int unpack_string(grib_accessor* a, char* buffer, size_t* len) strcpy(tmp, table->entries[value].title); } else { -#if 1 snprintf(tmp, sizeof(tmp), "%d", (int)value); -#else - return GRIB_DECODING_ERROR; -#endif } l = strlen(tmp) + 1; diff --git a/src/grib_accessor_class_codetable_units.cc b/src/grib_accessor_class_codetable_units.cc index dee16e4e8..aaaf9cffd 100644 --- a/src/grib_accessor_class_codetable_units.cc +++ b/src/grib_accessor_class_codetable_units.cc @@ -98,12 +98,6 @@ static grib_accessor_class _grib_accessor_class_codetable_units = { grib_accessor_class* grib_accessor_class_codetable_units = &_grib_accessor_class_codetable_units; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ typedef struct grib_accessor_codetable diff --git a/src/grib_accessor_class_concept.cc b/src/grib_accessor_class_concept.cc index f280ea39d..d69b8d1c1 100644 --- a/src/grib_accessor_class_concept.cc +++ b/src/grib_accessor_class_concept.cc @@ -115,12 +115,6 @@ static grib_accessor_class _grib_accessor_class_concept = { grib_accessor_class* grib_accessor_class_concept = &_grib_accessor_class_concept; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ #define MAX_CONCEPT_STRING_LENGTH 255 @@ -593,53 +587,6 @@ static void destroy(grib_context* c, grib_accessor* a) //grib_context_free(c,self->cval); } -// static int is_local_ecmwf_grib2_param_key(grib_accessor* a, long edition, long centre) -// { -// if (edition == 2 && centre == 98) { -// if (a->parent->owner && a->parent->owner->name && strcmp(a->parent->owner->name, "parameters") == 0) -// return 1; -// } -// return 0; -// } - -// /* Try to get the name, shortName, units etc for a GRIB2 message with -// * local ECMWF coding i.e. discipline=192 etc -// */ -// static const char* get_ECMWF_local_parameter(grib_accessor* a, grib_handle* h) -// { -// int err = 0; -// const char* key_name = a->name; /*this is the key whose value we want*/ -// long edition, centre; -// if (h->product_kind != PRODUCT_GRIB) -// return NULL; -// err = grib_get_long(h, "centre", ¢re); -// if (err) -// return NULL; -// err = grib_get_long(h, "edition", &edition); -// if (err) -// return NULL; -// if (is_local_ecmwf_grib2_param_key(a, edition, centre)) { -// /* Must be one of: 'name', 'shortName', 'units', 'cfName' etc */ -// grib_accessor* a2 = NULL; -// const long pid_guess = guess_paramId(h); -// if (pid_guess == -1) -// return NULL; - -// /* Change the paramId so we can get the other string key*/ -// err = grib_set_long(h, "paramId", pid_guess); -// if (err) -// return NULL; -// /* Get the string value of key. Do not call grib_get_string() to avoid -// * dangers of infinite recursion as that calls unpack_string()! -// */ -// a2 = grib_find_accessor(h, key_name); -// if (!a2) -// return NULL; -// return concept_evaluate(a2); -// } -// return NULL; -// } - static int unpack_string(grib_accessor* a, char* val, size_t* len) { size_t slen; diff --git a/src/grib_accessor_class_constant.cc b/src/grib_accessor_class_constant.cc index 6509fa0eb..4e5524336 100644 --- a/src/grib_accessor_class_constant.cc +++ b/src/grib_accessor_class_constant.cc @@ -107,26 +107,8 @@ static grib_accessor_class _grib_accessor_class_constant = { grib_accessor_class* grib_accessor_class_constant = &_grib_accessor_class_constant; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ -void accessor_constant_set_type(grib_accessor* a, int type) -{ - grib_accessor_constant* self = (grib_accessor_constant*)a; - self->type = type; -} - -void accessor_constant_set_dval(grib_accessor* a, double dval) -{ - grib_accessor_constant* self = (grib_accessor_constant*)a; - self->dval = dval; -} - static void init(grib_accessor* a, const long len, grib_arguments* arg) { a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY; diff --git a/src/grib_accessor_class_count_file.cc b/src/grib_accessor_class_count_file.cc index 767a7c04b..56aae6dbf 100644 --- a/src/grib_accessor_class_count_file.cc +++ b/src/grib_accessor_class_count_file.cc @@ -99,12 +99,6 @@ static grib_accessor_class _grib_accessor_class_count_file = { grib_accessor_class* grib_accessor_class_count_file = &_grib_accessor_class_count_file; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_count_missing.cc b/src/grib_accessor_class_count_missing.cc index be7e56d45..acc68e404 100644 --- a/src/grib_accessor_class_count_missing.cc +++ b/src/grib_accessor_class_count_missing.cc @@ -106,12 +106,6 @@ static grib_accessor_class _grib_accessor_class_count_missing = { grib_accessor_class* grib_accessor_class_count_missing = &_grib_accessor_class_count_missing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static const unsigned char bitsoff[] = { @@ -133,26 +127,6 @@ static const unsigned char bitsoff[] = { 0 }; -/* -static const unsigned char bitson[]={ -0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1, -2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 1, 2, -2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, -4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 1, 2, 2, 3, -2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, -4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 2, 3, 3, 4, 3, 4, -4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, -6, 4, 5, 5, 6, 5, 6, 6, 7, 1, 2, 2, 3, 2, 3, 3, 4, -2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, -4, 4, 5, 4, 5, 5, 6, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, -4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, -6, 5, 6, 6, 7, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, -4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, -6, 6, 7, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, -6, 7, 4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, -8 }; -*/ - static void init(grib_accessor* a, const long len, grib_arguments* arg) { int n = 0; diff --git a/src/grib_accessor_class_count_total.cc b/src/grib_accessor_class_count_total.cc index 655c56cbe..df49818f3 100644 --- a/src/grib_accessor_class_count_total.cc +++ b/src/grib_accessor_class_count_total.cc @@ -101,12 +101,6 @@ static grib_accessor_class _grib_accessor_class_count_total = { grib_accessor_class* grib_accessor_class_count_total = &_grib_accessor_class_count_total; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_data_2order_packing.cc b/src/grib_accessor_class_data_2order_packing.cc index a501dbdf1..2f641eb64 100644 --- a/src/grib_accessor_class_data_2order_packing.cc +++ b/src/grib_accessor_class_data_2order_packing.cc @@ -154,12 +154,6 @@ static grib_accessor_class _grib_accessor_class_data_2order_packing = { grib_accessor_class* grib_accessor_class_data_2order_packing = &_grib_accessor_class_data_2order_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_apply_bitmap.cc b/src/grib_accessor_class_data_apply_bitmap.cc index 092f01820..da64ece90 100644 --- a/src/grib_accessor_class_data_apply_bitmap.cc +++ b/src/grib_accessor_class_data_apply_bitmap.cc @@ -118,12 +118,6 @@ static grib_accessor_class _grib_accessor_class_data_apply_bitmap = { grib_accessor_class* grib_accessor_class_data_apply_bitmap = &_grib_accessor_class_data_apply_bitmap; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_apply_boustrophedonic.cc b/src/grib_accessor_class_data_apply_boustrophedonic.cc index 4177e8ef6..747e47653 100644 --- a/src/grib_accessor_class_data_apply_boustrophedonic.cc +++ b/src/grib_accessor_class_data_apply_boustrophedonic.cc @@ -116,12 +116,6 @@ static grib_accessor_class _grib_accessor_class_data_apply_boustrophedonic = { grib_accessor_class* grib_accessor_class_data_apply_boustrophedonic = &_grib_accessor_class_data_apply_boustrophedonic; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc b/src/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc index ea5e6217a..f3c6fdb35 100644 --- a/src/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc +++ b/src/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc @@ -119,12 +119,6 @@ static grib_accessor_class _grib_accessor_class_data_apply_boustrophedonic_bitma grib_accessor_class* grib_accessor_class_data_apply_boustrophedonic_bitmap = &_grib_accessor_class_data_apply_boustrophedonic_bitmap; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_apply_gdsnotpresent.cc b/src/grib_accessor_class_data_apply_gdsnotpresent.cc index 120e0e043..89b42f160 100644 --- a/src/grib_accessor_class_data_apply_gdsnotpresent.cc +++ b/src/grib_accessor_class_data_apply_gdsnotpresent.cc @@ -123,12 +123,6 @@ static grib_accessor_class _grib_accessor_class_data_apply_gdsnotpresent = { grib_accessor_class* grib_accessor_class_data_apply_gdsnotpresent = &_grib_accessor_class_data_apply_gdsnotpresent; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_ccsds_packing.cc b/src/grib_accessor_class_data_ccsds_packing.cc index 1035ce9f1..7f0b511d3 100644 --- a/src/grib_accessor_class_data_ccsds_packing.cc +++ b/src/grib_accessor_class_data_ccsds_packing.cc @@ -135,12 +135,6 @@ static grib_accessor_class _grib_accessor_class_data_ccsds_packing = { grib_accessor_class* grib_accessor_class_data_ccsds_packing = &_grib_accessor_class_data_ccsds_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_complex_packing.cc b/src/grib_accessor_class_data_complex_packing.cc index f8595a858..85cafae38 100644 --- a/src/grib_accessor_class_data_complex_packing.cc +++ b/src/grib_accessor_class_data_complex_packing.cc @@ -142,12 +142,6 @@ static grib_accessor_class _grib_accessor_class_data_complex_packing = { grib_accessor_class* grib_accessor_class_data_complex_packing = &_grib_accessor_class_data_complex_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ typedef unsigned long (*encode_float_proc)(double); diff --git a/src/grib_accessor_class_data_dummy_field.cc b/src/grib_accessor_class_data_dummy_field.cc index 61391b800..69a14bbbd 100644 --- a/src/grib_accessor_class_data_dummy_field.cc +++ b/src/grib_accessor_class_data_dummy_field.cc @@ -128,12 +128,6 @@ static grib_accessor_class _grib_accessor_class_data_dummy_field = { grib_accessor_class* grib_accessor_class_data_dummy_field = &_grib_accessor_class_data_dummy_field; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_g1complex_packing.cc b/src/grib_accessor_class_data_g1complex_packing.cc index f77cbb30b..b66ba7187 100644 --- a/src/grib_accessor_class_data_g1complex_packing.cc +++ b/src/grib_accessor_class_data_g1complex_packing.cc @@ -135,12 +135,6 @@ static grib_accessor_class _grib_accessor_class_data_g1complex_packing = { grib_accessor_class* grib_accessor_class_data_g1complex_packing = &_grib_accessor_class_data_g1complex_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) @@ -209,17 +203,17 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len) if (ret == GRIB_SUCCESS) { n = a->offset + 4 * ((sub_k + 1) * (sub_k + 2)); -#if 1 + /* Octet number starts from beginning of message but shouldn't */ if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->N, n)) != GRIB_SUCCESS) return ret; -#else - ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetsection, &offsetsection); - if (ret != GRIB_SUCCESS) - return ret; - if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->N, n - offsetsection)) != GRIB_SUCCESS) - return ret; -#endif + + // ret = grib_get_long_internal(grib_handle_of_accessor(a), self->offsetsection, &offsetsection); + // if (ret != GRIB_SUCCESS) + // return ret; + // if ((ret = grib_set_long_internal(grib_handle_of_accessor(a), self->N, n - offsetsection)) != GRIB_SUCCESS) + // return ret; + ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bits_per_value, &bits_per_value); if (ret != GRIB_SUCCESS) return ret; diff --git a/src/grib_accessor_class_data_g1second_order_constant_width_packing.cc b/src/grib_accessor_class_data_g1second_order_constant_width_packing.cc index 74a70b3ac..33b28f508 100644 --- a/src/grib_accessor_class_data_g1second_order_constant_width_packing.cc +++ b/src/grib_accessor_class_data_g1second_order_constant_width_packing.cc @@ -155,12 +155,6 @@ static grib_accessor_class _grib_accessor_class_data_g1second_order_constant_wid grib_accessor_class* grib_accessor_class_data_g1second_order_constant_width_packing = &_grib_accessor_class_data_g1second_order_constant_width_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_g1second_order_general_extended_packing.cc b/src/grib_accessor_class_data_g1second_order_general_extended_packing.cc index 7deb5fbaa..1aab32630 100644 --- a/src/grib_accessor_class_data_g1second_order_general_extended_packing.cc +++ b/src/grib_accessor_class_data_g1second_order_general_extended_packing.cc @@ -48,6 +48,8 @@ MEMBERS=const char* dataFlag MEMBERS=double* dvalues MEMBERS=float* fvalues + MEMBERS=int double_dirty + MEMBERS=int float_dirty MEMBERS=size_t size MEMBERS=int double_dirty MEMBERS=int float_dirty @@ -180,12 +182,6 @@ static grib_accessor_class _grib_accessor_class_data_g1second_order_general_exte grib_accessor_class* grib_accessor_class_data_g1second_order_general_extended_packing = &_grib_accessor_class_data_g1second_order_general_extended_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ #define MAX_NUMBER_OF_GROUPS 65534 diff --git a/src/grib_accessor_class_data_g1second_order_general_packing.cc b/src/grib_accessor_class_data_g1second_order_general_packing.cc index 190220be5..d9388619b 100644 --- a/src/grib_accessor_class_data_g1second_order_general_packing.cc +++ b/src/grib_accessor_class_data_g1second_order_general_packing.cc @@ -154,12 +154,6 @@ static grib_accessor_class _grib_accessor_class_data_g1second_order_general_pack grib_accessor_class* grib_accessor_class_data_g1second_order_general_packing = &_grib_accessor_class_data_g1second_order_general_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_g1second_order_row_by_row_packing.cc b/src/grib_accessor_class_data_g1second_order_row_by_row_packing.cc index 55e699aac..cc4c9ea9c 100644 --- a/src/grib_accessor_class_data_g1second_order_row_by_row_packing.cc +++ b/src/grib_accessor_class_data_g1second_order_row_by_row_packing.cc @@ -152,12 +152,6 @@ static grib_accessor_class _grib_accessor_class_data_g1second_order_row_by_row_p grib_accessor_class* grib_accessor_class_data_g1second_order_row_by_row_packing = &_grib_accessor_class_data_g1second_order_row_by_row_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_g1secondary_bitmap.cc b/src/grib_accessor_class_data_g1secondary_bitmap.cc index 31ed7bef3..2e82646dc 100644 --- a/src/grib_accessor_class_data_g1secondary_bitmap.cc +++ b/src/grib_accessor_class_data_g1secondary_bitmap.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_data_g1secondary_bitmap = { grib_accessor_class* grib_accessor_class_data_g1secondary_bitmap = &_grib_accessor_class_data_g1secondary_bitmap; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_g1shsimple_packing.cc b/src/grib_accessor_class_data_g1shsimple_packing.cc index 0f5e67328..d50c32830 100644 --- a/src/grib_accessor_class_data_g1shsimple_packing.cc +++ b/src/grib_accessor_class_data_g1shsimple_packing.cc @@ -99,12 +99,6 @@ static grib_accessor_class _grib_accessor_class_data_g1shsimple_packing = { grib_accessor_class* grib_accessor_class_data_g1shsimple_packing = &_grib_accessor_class_data_g1shsimple_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_data_g1simple_packing.cc b/src/grib_accessor_class_data_g1simple_packing.cc index aeaf5f5c8..1b4d08e82 100644 --- a/src/grib_accessor_class_data_g1simple_packing.cc +++ b/src/grib_accessor_class_data_g1simple_packing.cc @@ -124,12 +124,6 @@ static grib_accessor_class _grib_accessor_class_data_g1simple_packing = { grib_accessor_class* grib_accessor_class_data_g1simple_packing = &_grib_accessor_class_data_g1simple_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_g22order_packing.cc b/src/grib_accessor_class_data_g22order_packing.cc index e930fe264..262e96896 100644 --- a/src/grib_accessor_class_data_g22order_packing.cc +++ b/src/grib_accessor_class_data_g22order_packing.cc @@ -155,12 +155,6 @@ static grib_accessor_class _grib_accessor_class_data_g22order_packing = { grib_accessor_class* grib_accessor_class_data_g22order_packing = &_grib_accessor_class_data_g22order_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_g2bifourier_packing.cc b/src/grib_accessor_class_data_g2bifourier_packing.cc index 8dc83650e..2554f9ecd 100644 --- a/src/grib_accessor_class_data_g2bifourier_packing.cc +++ b/src/grib_accessor_class_data_g2bifourier_packing.cc @@ -151,12 +151,6 @@ static grib_accessor_class _grib_accessor_class_data_g2bifourier_packing = { grib_accessor_class* grib_accessor_class_data_g2bifourier_packing = &_grib_accessor_class_data_g2bifourier_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ typedef unsigned long (*encode_float_proc)(double); diff --git a/src/grib_accessor_class_data_g2complex_packing.cc b/src/grib_accessor_class_data_g2complex_packing.cc index d6a0b50e8..b0b77faca 100644 --- a/src/grib_accessor_class_data_g2complex_packing.cc +++ b/src/grib_accessor_class_data_g2complex_packing.cc @@ -128,12 +128,6 @@ static grib_accessor_class _grib_accessor_class_data_g2complex_packing = { grib_accessor_class* grib_accessor_class_data_g2complex_packing = &_grib_accessor_class_data_g2complex_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_g2secondary_bitmap.cc b/src/grib_accessor_class_data_g2secondary_bitmap.cc index f53c571b5..608cdbfad 100644 --- a/src/grib_accessor_class_data_g2secondary_bitmap.cc +++ b/src/grib_accessor_class_data_g2secondary_bitmap.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_data_g2secondary_bitmap = { grib_accessor_class* grib_accessor_class_data_g2secondary_bitmap = &_grib_accessor_class_data_g2secondary_bitmap; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_g2shsimple_packing.cc b/src/grib_accessor_class_data_g2shsimple_packing.cc index 9cae61828..1f1a8b323 100644 --- a/src/grib_accessor_class_data_g2shsimple_packing.cc +++ b/src/grib_accessor_class_data_g2shsimple_packing.cc @@ -107,12 +107,6 @@ static grib_accessor_class _grib_accessor_class_data_g2shsimple_packing = { grib_accessor_class* grib_accessor_class_data_g2shsimple_packing = &_grib_accessor_class_data_g2shsimple_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_g2simple_packing.cc b/src/grib_accessor_class_data_g2simple_packing.cc index d3323bbdf..f3bdd2577 100644 --- a/src/grib_accessor_class_data_g2simple_packing.cc +++ b/src/grib_accessor_class_data_g2simple_packing.cc @@ -118,12 +118,6 @@ static grib_accessor_class _grib_accessor_class_data_g2simple_packing = { grib_accessor_class* grib_accessor_class_data_g2simple_packing = &_grib_accessor_class_data_g2simple_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc b/src/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc index 3cbbd1d64..de6cb7907 100644 --- a/src/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc +++ b/src/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc @@ -124,12 +124,6 @@ static grib_accessor_class _grib_accessor_class_data_g2simple_packing_with_prepr grib_accessor_class* grib_accessor_class_data_g2simple_packing_with_preprocessing = &_grib_accessor_class_data_g2simple_packing_with_preprocessing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_jpeg2000_packing.cc b/src/grib_accessor_class_data_jpeg2000_packing.cc index a9d8c4410..09a807b8b 100644 --- a/src/grib_accessor_class_data_jpeg2000_packing.cc +++ b/src/grib_accessor_class_data_jpeg2000_packing.cc @@ -140,12 +140,6 @@ static grib_accessor_class _grib_accessor_class_data_jpeg2000_packing = { grib_accessor_class* grib_accessor_class_data_jpeg2000_packing = &_grib_accessor_class_data_jpeg2000_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int first = 1; diff --git a/src/grib_accessor_class_data_png_packing.cc b/src/grib_accessor_class_data_png_packing.cc index f8890c237..10265b2a9 100644 --- a/src/grib_accessor_class_data_png_packing.cc +++ b/src/grib_accessor_class_data_png_packing.cc @@ -132,12 +132,6 @@ static grib_accessor_class _grib_accessor_class_data_png_packing = { grib_accessor_class* grib_accessor_class_data_png_packing = &_grib_accessor_class_data_png_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_raw_packing.cc b/src/grib_accessor_class_data_raw_packing.cc index 2d36ef58a..21485a6c7 100644 --- a/src/grib_accessor_class_data_raw_packing.cc +++ b/src/grib_accessor_class_data_raw_packing.cc @@ -118,12 +118,6 @@ static grib_accessor_class _grib_accessor_class_data_raw_packing = { grib_accessor_class* grib_accessor_class_data_raw_packing = &_grib_accessor_class_data_raw_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_run_length_packing.cc b/src/grib_accessor_class_data_run_length_packing.cc index 422675438..3624418f3 100644 --- a/src/grib_accessor_class_data_run_length_packing.cc +++ b/src/grib_accessor_class_data_run_length_packing.cc @@ -119,12 +119,6 @@ static grib_accessor_class _grib_accessor_class_data_run_length_packing = { grib_accessor_class* grib_accessor_class_data_run_length_packing = &_grib_accessor_class_data_run_length_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_secondary_bitmap.cc b/src/grib_accessor_class_data_secondary_bitmap.cc index 0bbc08886..0824bb0c1 100644 --- a/src/grib_accessor_class_data_secondary_bitmap.cc +++ b/src/grib_accessor_class_data_secondary_bitmap.cc @@ -106,12 +106,6 @@ static grib_accessor_class _grib_accessor_class_data_secondary_bitmap = { grib_accessor_class* grib_accessor_class_data_secondary_bitmap = &_grib_accessor_class_data_secondary_bitmap; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_sh_packed.cc b/src/grib_accessor_class_data_sh_packed.cc index b1c24e6cd..abb9538d7 100644 --- a/src/grib_accessor_class_data_sh_packed.cc +++ b/src/grib_accessor_class_data_sh_packed.cc @@ -137,12 +137,6 @@ static grib_accessor_class _grib_accessor_class_data_sh_packed = { grib_accessor_class* grib_accessor_class_data_sh_packed = &_grib_accessor_class_data_sh_packed; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ typedef unsigned long (*encode_float_proc)(double); diff --git a/src/grib_accessor_class_data_sh_unpacked.cc b/src/grib_accessor_class_data_sh_unpacked.cc index 0b7499118..c68a1c38c 100644 --- a/src/grib_accessor_class_data_sh_unpacked.cc +++ b/src/grib_accessor_class_data_sh_unpacked.cc @@ -137,12 +137,6 @@ static grib_accessor_class _grib_accessor_class_data_sh_unpacked = { grib_accessor_class* grib_accessor_class_data_sh_unpacked = &_grib_accessor_class_data_sh_unpacked; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ typedef unsigned long (*encode_float_proc)(double); diff --git a/src/grib_accessor_class_data_shsimple_packing.cc b/src/grib_accessor_class_data_shsimple_packing.cc index 6e7c2c095..1019ef2f6 100644 --- a/src/grib_accessor_class_data_shsimple_packing.cc +++ b/src/grib_accessor_class_data_shsimple_packing.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_data_shsimple_packing = { grib_accessor_class* grib_accessor_class_data_shsimple_packing = &_grib_accessor_class_data_shsimple_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_data_simple_packing.cc b/src/grib_accessor_class_data_simple_packing.cc index 6141a6c60..e6475cadd 100644 --- a/src/grib_accessor_class_data_simple_packing.cc +++ b/src/grib_accessor_class_data_simple_packing.cc @@ -136,12 +136,6 @@ static grib_accessor_class _grib_accessor_class_data_simple_packing = { grib_accessor_class* grib_accessor_class_data_simple_packing = &_grib_accessor_class_data_simple_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) @@ -582,31 +576,6 @@ static int unpack_double_subarray(grib_accessor* a, double* val, size_t start, s return _unpack_double(a, val, plen, buf, pos, nvals); } -#if GRIB_IBMPOWER67_OPT -#define restrict -#include "minmax_val.cc" -#undef restrict -#endif - -// static int grib_producing_large_constant_fields(const grib_context* c, grib_handle* h, int edition) -// { -// /* GRIB-802: If override key is set, ignore env. var and produce compressed fields */ -// if (c->large_constant_fields) { /* This is set by the environment variable */ -// /* check the override key */ -// int err = 0; -// long override_large_constant_fields = 0; -// err = grib_get_long_internal(h, "override_large_constant_fields", &override_large_constant_fields); -// if (err == GRIB_SUCCESS && override_large_constant_fields) { -// return 0; -// } -// return 1; -// } -// if (c->gribex_mode_on==1 && edition==1) { -// return 1; -// } -// return 0; -// } - static int pack_double(grib_accessor* a, const double* val, size_t* len) { grib_accessor_data_simple_packing* self = (grib_accessor_data_simple_packing*)a; @@ -659,14 +628,11 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len) max = val[0]; min = max; -#if GRIB_IBMPOWER67_OPT - minmax_val(val + 1, n_vals - 1, &min, &max); -#else for (i = 1; i < n_vals; i++) { if (val[i] > max) max = val[i]; else if (val[i] < min) min = val[i]; } -#endif + if ((err = grib_check_data_values_range(gh, min, max)) != GRIB_SUCCESS) { return err; } diff --git a/src/grib_accessor_class_decimal_precision.cc b/src/grib_accessor_class_decimal_precision.cc index 1b91dc142..90de5cbc0 100644 --- a/src/grib_accessor_class_decimal_precision.cc +++ b/src/grib_accessor_class_decimal_precision.cc @@ -108,12 +108,6 @@ static grib_accessor_class _grib_accessor_class_decimal_precision = { grib_accessor_class* grib_accessor_class_decimal_precision = &_grib_accessor_class_decimal_precision; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* args) diff --git a/src/grib_accessor_class_dictionary.cc b/src/grib_accessor_class_dictionary.cc index 212221e79..73f8b7eaa 100644 --- a/src/grib_accessor_class_dictionary.cc +++ b/src/grib_accessor_class_dictionary.cc @@ -111,12 +111,6 @@ static grib_accessor_class _grib_accessor_class_dictionary = { grib_accessor_class* grib_accessor_class_dictionary = &_grib_accessor_class_dictionary; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* params) @@ -134,7 +128,7 @@ static void init(grib_accessor* a, const long len, grib_arguments* params) a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY; } -static grib_trie* load_dictionary(grib_accessor* a, grib_context* c, int* err) +static grib_trie* load_dictionary(grib_accessor* a, int* err) { grib_accessor_dictionary* self = (grib_accessor_dictionary*)a; @@ -151,6 +145,7 @@ static grib_trie* load_dictionary(grib_accessor* a, grib_context* c, int* err) FILE* f = NULL; int i = 0; grib_handle* h = grib_handle_of_accessor(a); + grib_context* c = a->context; *err = GRIB_SUCCESS; @@ -276,7 +271,7 @@ static int unpack_string(grib_accessor* a, char* buffer, size_t* len) size_t rsize = 0; int i = 0; - grib_trie* dictionary = load_dictionary(a, a->context, &err); + grib_trie* dictionary = load_dictionary(a, &err); if (err) return err; diff --git a/src/grib_accessor_class_dirty.cc b/src/grib_accessor_class_dirty.cc index c3c95e913..8f90784a9 100644 --- a/src/grib_accessor_class_dirty.cc +++ b/src/grib_accessor_class_dirty.cc @@ -103,12 +103,6 @@ static grib_accessor_class _grib_accessor_class_dirty = { grib_accessor_class* grib_accessor_class_dirty = &_grib_accessor_class_dirty; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_divdouble.cc b/src/grib_accessor_class_divdouble.cc index 769965405..c0c97ba99 100644 --- a/src/grib_accessor_class_divdouble.cc +++ b/src/grib_accessor_class_divdouble.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_divdouble = { grib_accessor_class* grib_accessor_class_divdouble = &_grib_accessor_class_divdouble; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_double.cc b/src/grib_accessor_class_double.cc index be2c62df1..cd4631094 100644 --- a/src/grib_accessor_class_double.cc +++ b/src/grib_accessor_class_double.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_double = { grib_accessor_class* grib_accessor_class_double = &_grib_accessor_class_double; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int get_native_type(grib_accessor* a) diff --git a/src/grib_accessor_class_element.cc b/src/grib_accessor_class_element.cc index e72b8fedc..fe5f65c4d 100644 --- a/src/grib_accessor_class_element.cc +++ b/src/grib_accessor_class_element.cc @@ -106,12 +106,6 @@ static grib_accessor_class _grib_accessor_class_element = { grib_accessor_class* grib_accessor_class_element = &_grib_accessor_class_element; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_evaluate.cc b/src/grib_accessor_class_evaluate.cc index dbeed30aa..0f45b17f3 100644 --- a/src/grib_accessor_class_evaluate.cc +++ b/src/grib_accessor_class_evaluate.cc @@ -99,12 +99,6 @@ static grib_accessor_class _grib_accessor_class_evaluate = { grib_accessor_class* grib_accessor_class_evaluate = &_grib_accessor_class_evaluate; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_expanded_descriptors.cc b/src/grib_accessor_class_expanded_descriptors.cc index d944e7d35..d22d2b492 100644 --- a/src/grib_accessor_class_expanded_descriptors.cc +++ b/src/grib_accessor_class_expanded_descriptors.cc @@ -131,12 +131,6 @@ static grib_accessor_class _grib_accessor_class_expanded_descriptors = { grib_accessor_class* grib_accessor_class_expanded_descriptors = &_grib_accessor_class_expanded_descriptors; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ #define MYDEBUG 0 @@ -836,10 +830,9 @@ static int value_count(grib_accessor* a, long* rlen) static void destroy(grib_context* c, grib_accessor* a) { - /* grib_accessor_expanded_descriptors* self = (grib_accessor_expanded_descriptors*)a; */ - /* if (self->rank==0 && self->expanded) { */ - /* grib_bufr_descriptors_array_delete(self->expanded); */ - /* } */ + // grib_accessor_expanded_descriptors* self = (grib_accessor_expanded_descriptors*)a; + // if (self->rank==0 && self->expanded) + // grib_bufr_descriptors_array_delete(self->expanded); } static int get_native_type(grib_accessor* a) diff --git a/src/grib_accessor_class_from_scale_factor_scaled_value.cc b/src/grib_accessor_class_from_scale_factor_scaled_value.cc index 21a41a1e3..4292c1385 100644 --- a/src/grib_accessor_class_from_scale_factor_scaled_value.cc +++ b/src/grib_accessor_class_from_scale_factor_scaled_value.cc @@ -109,12 +109,6 @@ static grib_accessor_class _grib_accessor_class_from_scale_factor_scaled_value = grib_accessor_class* grib_accessor_class_from_scale_factor_scaled_value = &_grib_accessor_class_from_scale_factor_scaled_value; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g1_half_byte_codeflag.cc b/src/grib_accessor_class_g1_half_byte_codeflag.cc index cb2d6d489..dd758006b 100644 --- a/src/grib_accessor_class_g1_half_byte_codeflag.cc +++ b/src/grib_accessor_class_g1_half_byte_codeflag.cc @@ -102,12 +102,6 @@ static grib_accessor_class _grib_accessor_class_g1_half_byte_codeflag = { grib_accessor_class* grib_accessor_class_g1_half_byte_codeflag = &_grib_accessor_class_g1_half_byte_codeflag; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_g1_message_length.cc b/src/grib_accessor_class_g1_message_length.cc index 2e7ed7d07..fc8c9dfc1 100644 --- a/src/grib_accessor_class_g1_message_length.cc +++ b/src/grib_accessor_class_g1_message_length.cc @@ -102,12 +102,6 @@ static grib_accessor_class _grib_accessor_class_g1_message_length = { grib_accessor_class* grib_accessor_class_g1_message_length = &_grib_accessor_class_g1_message_length; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* args) @@ -200,10 +194,8 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len) /* Do not do the length checks in this special case */ if ((ret = pack_long_unsigned_helper(a, &tlen, len, /*check=*/0)) != GRIB_SUCCESS) return ret; - /* - if((ret = super->pack_long(a,&tlen,len)) != GRIB_SUCCESS) - return ret; - */ + + // if((ret = super->pack_long(a,&tlen,len)) != GRIB_SUCCESS) return ret; { long total_length = -1, sec4_length = -1; diff --git a/src/grib_accessor_class_g1_section4_length.cc b/src/grib_accessor_class_g1_section4_length.cc index 3b22c010b..2f80815b9 100644 --- a/src/grib_accessor_class_g1_section4_length.cc +++ b/src/grib_accessor_class_g1_section4_length.cc @@ -102,12 +102,6 @@ static grib_accessor_class _grib_accessor_class_g1_section4_length = { grib_accessor_class* grib_accessor_class_g1_section4_length = &_grib_accessor_class_g1_section4_length; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* args) diff --git a/src/grib_accessor_class_g1area.cc b/src/grib_accessor_class_g1area.cc index 842e23954..4f2e29154 100644 --- a/src/grib_accessor_class_g1area.cc +++ b/src/grib_accessor_class_g1area.cc @@ -110,12 +110,6 @@ static grib_accessor_class _grib_accessor_class_g1area = { grib_accessor_class* grib_accessor_class_g1area = &_grib_accessor_class_g1area; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g1bitmap.cc b/src/grib_accessor_class_g1bitmap.cc index 6040f5e55..33eb0d935 100644 --- a/src/grib_accessor_class_g1bitmap.cc +++ b/src/grib_accessor_class_g1bitmap.cc @@ -106,12 +106,6 @@ static grib_accessor_class _grib_accessor_class_g1bitmap = { grib_accessor_class* grib_accessor_class_g1bitmap = &_grib_accessor_class_g1bitmap; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_g1date.cc b/src/grib_accessor_class_g1date.cc index f5345f1b5..5157b5731 100644 --- a/src/grib_accessor_class_g1date.cc +++ b/src/grib_accessor_class_g1date.cc @@ -113,12 +113,6 @@ static grib_accessor_class _grib_accessor_class_g1date = { grib_accessor_class* grib_accessor_class_g1date = &_grib_accessor_class_g1date; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g1day_of_the_year_date.cc b/src/grib_accessor_class_g1day_of_the_year_date.cc index ebb5b7109..f5bbd9b0a 100644 --- a/src/grib_accessor_class_g1day_of_the_year_date.cc +++ b/src/grib_accessor_class_g1day_of_the_year_date.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_g1day_of_the_year_date = { grib_accessor_class* grib_accessor_class_g1day_of_the_year_date = &_grib_accessor_class_g1day_of_the_year_date; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_g1end_of_interval_monthly.cc b/src/grib_accessor_class_g1end_of_interval_monthly.cc index 400ce91b6..12a184a88 100644 --- a/src/grib_accessor_class_g1end_of_interval_monthly.cc +++ b/src/grib_accessor_class_g1end_of_interval_monthly.cc @@ -105,12 +105,6 @@ static grib_accessor_class _grib_accessor_class_g1end_of_interval_monthly = { grib_accessor_class* grib_accessor_class_g1end_of_interval_monthly = &_grib_accessor_class_g1end_of_interval_monthly; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g1fcperiod.cc b/src/grib_accessor_class_g1fcperiod.cc index 33451dc78..38f5d6359 100644 --- a/src/grib_accessor_class_g1fcperiod.cc +++ b/src/grib_accessor_class_g1fcperiod.cc @@ -106,12 +106,6 @@ static grib_accessor_class _grib_accessor_class_g1fcperiod = { grib_accessor_class* grib_accessor_class_g1fcperiod = &_grib_accessor_class_g1fcperiod; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_string(grib_accessor* a, char* val, size_t* len) diff --git a/src/grib_accessor_class_g1forecastmonth.cc b/src/grib_accessor_class_g1forecastmonth.cc index f1c65cff8..70514cfb9 100644 --- a/src/grib_accessor_class_g1forecastmonth.cc +++ b/src/grib_accessor_class_g1forecastmonth.cc @@ -111,12 +111,6 @@ static grib_accessor_class _grib_accessor_class_g1forecastmonth = { grib_accessor_class* grib_accessor_class_g1forecastmonth = &_grib_accessor_class_g1forecastmonth; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) @@ -142,12 +136,12 @@ static void dump(grib_accessor* a, grib_dumper* dumper) static int calculate_fcmonth(grib_accessor* a, long verification_yearmonth, long base_date, long day, long hour, long* result) { - long base_yearmonth = 0; + long base_yearmonth = 0; long vyear = 0; long vmonth = 0; long byear = 0; long bmonth = 0; - long fcmonth = 0; + long fcmonth = 0; base_yearmonth = base_date / 100; diff --git a/src/grib_accessor_class_g1monthlydate.cc b/src/grib_accessor_class_g1monthlydate.cc index 350815e65..45699f52d 100644 --- a/src/grib_accessor_class_g1monthlydate.cc +++ b/src/grib_accessor_class_g1monthlydate.cc @@ -105,12 +105,6 @@ static grib_accessor_class _grib_accessor_class_g1monthlydate = { grib_accessor_class* grib_accessor_class_g1monthlydate = &_grib_accessor_class_g1monthlydate; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g1number_of_coded_values_sh_complex.cc b/src/grib_accessor_class_g1number_of_coded_values_sh_complex.cc index 6308d5e75..3cf159f70 100644 --- a/src/grib_accessor_class_g1number_of_coded_values_sh_complex.cc +++ b/src/grib_accessor_class_g1number_of_coded_values_sh_complex.cc @@ -115,12 +115,6 @@ static grib_accessor_class _grib_accessor_class_g1number_of_coded_values_sh_comp grib_accessor_class* grib_accessor_class_g1number_of_coded_values_sh_complex = &_grib_accessor_class_g1number_of_coded_values_sh_complex; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g1number_of_coded_values_sh_simple.cc b/src/grib_accessor_class_g1number_of_coded_values_sh_simple.cc index 1a98e26ce..cbe3dfba0 100644 --- a/src/grib_accessor_class_g1number_of_coded_values_sh_simple.cc +++ b/src/grib_accessor_class_g1number_of_coded_values_sh_simple.cc @@ -109,12 +109,6 @@ static grib_accessor_class _grib_accessor_class_g1number_of_coded_values_sh_simp grib_accessor_class* grib_accessor_class_g1number_of_coded_values_sh_simple = &_grib_accessor_class_g1number_of_coded_values_sh_simple; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g1step_range.cc b/src/grib_accessor_class_g1step_range.cc index 50b8abc49..f074ff687 100644 --- a/src/grib_accessor_class_g1step_range.cc +++ b/src/grib_accessor_class_g1step_range.cc @@ -129,12 +129,6 @@ static grib_accessor_class _grib_accessor_class_g1step_range = { grib_accessor_class* grib_accessor_class_g1step_range = &_grib_accessor_class_g1step_range; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g1verificationdate.cc b/src/grib_accessor_class_g1verificationdate.cc index 76e74c789..ae38cf7ff 100644 --- a/src/grib_accessor_class_g1verificationdate.cc +++ b/src/grib_accessor_class_g1verificationdate.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_g1verificationdate = { grib_accessor_class* grib_accessor_class_g1verificationdate = &_grib_accessor_class_g1verificationdate; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g2_aerosol.cc b/src/grib_accessor_class_g2_aerosol.cc index 0e331ae17..3aca66af0 100644 --- a/src/grib_accessor_class_g2_aerosol.cc +++ b/src/grib_accessor_class_g2_aerosol.cc @@ -107,12 +107,6 @@ static grib_accessor_class _grib_accessor_class_g2_aerosol = { grib_accessor_class* grib_accessor_class_g2_aerosol = &_grib_accessor_class_g2_aerosol; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g2_chemical.cc b/src/grib_accessor_class_g2_chemical.cc index 48e97d659..0bd18b777 100644 --- a/src/grib_accessor_class_g2_chemical.cc +++ b/src/grib_accessor_class_g2_chemical.cc @@ -107,12 +107,6 @@ static grib_accessor_class _grib_accessor_class_g2_chemical = { grib_accessor_class* grib_accessor_class_g2_chemical = &_grib_accessor_class_g2_chemical; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g2_eps.cc b/src/grib_accessor_class_g2_eps.cc index 2b2293b33..6c7ca4486 100644 --- a/src/grib_accessor_class_g2_eps.cc +++ b/src/grib_accessor_class_g2_eps.cc @@ -112,12 +112,6 @@ static grib_accessor_class _grib_accessor_class_g2_eps = { grib_accessor_class* grib_accessor_class_g2_eps = &_grib_accessor_class_g2_eps; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g2_mars_labeling.cc b/src/grib_accessor_class_g2_mars_labeling.cc index bcf37f640..ea38afc93 100644 --- a/src/grib_accessor_class_g2_mars_labeling.cc +++ b/src/grib_accessor_class_g2_mars_labeling.cc @@ -127,12 +127,6 @@ static grib_accessor_class _grib_accessor_class_g2_mars_labeling = { grib_accessor_class* grib_accessor_class_g2_mars_labeling = &_grib_accessor_class_g2_mars_labeling; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g2bitmap.cc b/src/grib_accessor_class_g2bitmap.cc index 5ccbef31e..164ebd4ee 100644 --- a/src/grib_accessor_class_g2bitmap.cc +++ b/src/grib_accessor_class_g2bitmap.cc @@ -105,12 +105,6 @@ static grib_accessor_class _grib_accessor_class_g2bitmap = { grib_accessor_class* grib_accessor_class_g2bitmap = &_grib_accessor_class_g2bitmap; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_g2bitmap_present.cc b/src/grib_accessor_class_g2bitmap_present.cc index 7e7fcc13a..3d704342c 100644 --- a/src/grib_accessor_class_g2bitmap_present.cc +++ b/src/grib_accessor_class_g2bitmap_present.cc @@ -103,12 +103,6 @@ static grib_accessor_class _grib_accessor_class_g2bitmap_present = { grib_accessor_class* grib_accessor_class_g2bitmap_present = &_grib_accessor_class_g2bitmap_present; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g2date.cc b/src/grib_accessor_class_g2date.cc index 155716698..54367bdf2 100644 --- a/src/grib_accessor_class_g2date.cc +++ b/src/grib_accessor_class_g2date.cc @@ -106,12 +106,6 @@ static grib_accessor_class _grib_accessor_class_g2date = { grib_accessor_class* grib_accessor_class_g2date = &_grib_accessor_class_g2date; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) { diff --git a/src/grib_accessor_class_g2end_step.cc b/src/grib_accessor_class_g2end_step.cc index 2c009d162..1248386f5 100644 --- a/src/grib_accessor_class_g2end_step.cc +++ b/src/grib_accessor_class_g2end_step.cc @@ -138,12 +138,6 @@ static grib_accessor_class _grib_accessor_class_g2end_step = { grib_accessor_class* grib_accessor_class_g2end_step = &_grib_accessor_class_g2end_step; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g2grid.cc b/src/grib_accessor_class_g2grid.cc index 242c9565a..d11d5b8d3 100644 --- a/src/grib_accessor_class_g2grid.cc +++ b/src/grib_accessor_class_g2grid.cc @@ -115,12 +115,6 @@ static grib_accessor_class _grib_accessor_class_g2grid = { grib_accessor_class* grib_accessor_class_g2grid = &_grib_accessor_class_g2grid; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g2latlon.cc b/src/grib_accessor_class_g2latlon.cc index 8ba8bd4c6..509a08df2 100644 --- a/src/grib_accessor_class_g2latlon.cc +++ b/src/grib_accessor_class_g2latlon.cc @@ -110,12 +110,6 @@ static grib_accessor_class _grib_accessor_class_g2latlon = { grib_accessor_class* grib_accessor_class_g2latlon = &_grib_accessor_class_g2latlon; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g2level.cc b/src/grib_accessor_class_g2level.cc index 68cb1ff36..93d073d12 100644 --- a/src/grib_accessor_class_g2level.cc +++ b/src/grib_accessor_class_g2level.cc @@ -110,12 +110,6 @@ static grib_accessor_class _grib_accessor_class_g2level = { grib_accessor_class* grib_accessor_class_g2level = &_grib_accessor_class_g2level; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g2lon.cc b/src/grib_accessor_class_g2lon.cc index db02085e6..5587ac053 100644 --- a/src/grib_accessor_class_g2lon.cc +++ b/src/grib_accessor_class_g2lon.cc @@ -103,12 +103,6 @@ static grib_accessor_class _grib_accessor_class_g2lon = { grib_accessor_class* grib_accessor_class_g2lon = &_grib_accessor_class_g2lon; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_g2step_range.cc b/src/grib_accessor_class_g2step_range.cc index dbd7489ec..04d67f28b 100644 --- a/src/grib_accessor_class_g2step_range.cc +++ b/src/grib_accessor_class_g2step_range.cc @@ -112,12 +112,6 @@ static grib_accessor_class _grib_accessor_class_g2step_range = { grib_accessor_class* grib_accessor_class_g2step_range = &_grib_accessor_class_g2step_range; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_gaussian_grid_name.cc b/src/grib_accessor_class_gaussian_grid_name.cc index 0207170ce..fd8f10b08 100644 --- a/src/grib_accessor_class_gaussian_grid_name.cc +++ b/src/grib_accessor_class_gaussian_grid_name.cc @@ -103,12 +103,6 @@ static grib_accessor_class _grib_accessor_class_gaussian_grid_name = { grib_accessor_class* grib_accessor_class_gaussian_grid_name = &_grib_accessor_class_gaussian_grid_name; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_gds_is_present.cc b/src/grib_accessor_class_gds_is_present.cc index 3addb0a43..884d92380 100644 --- a/src/grib_accessor_class_gds_is_present.cc +++ b/src/grib_accessor_class_gds_is_present.cc @@ -109,12 +109,6 @@ static grib_accessor_class _grib_accessor_class_gds_is_present = { grib_accessor_class* grib_accessor_class_gds_is_present = &_grib_accessor_class_gds_is_present; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_gds_not_present_bitmap.cc b/src/grib_accessor_class_gds_not_present_bitmap.cc index dfee779ab..bd0d96ae1 100644 --- a/src/grib_accessor_class_gds_not_present_bitmap.cc +++ b/src/grib_accessor_class_gds_not_present_bitmap.cc @@ -114,12 +114,6 @@ static grib_accessor_class _grib_accessor_class_gds_not_present_bitmap = { grib_accessor_class* grib_accessor_class_gds_not_present_bitmap = &_grib_accessor_class_gds_not_present_bitmap; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_gen.cc b/src/grib_accessor_class_gen.cc index 2980eb3c9..bf59cdea0 100644 --- a/src/grib_accessor_class_gen.cc +++ b/src/grib_accessor_class_gen.cc @@ -143,12 +143,6 @@ static grib_accessor_class _grib_accessor_class_gen = { grib_accessor_class* grib_accessor_class_gen = &_grib_accessor_class_gen; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* param) diff --git a/src/grib_accessor_class_getenv.cc b/src/grib_accessor_class_getenv.cc index f236be739..ca542edd2 100644 --- a/src/grib_accessor_class_getenv.cc +++ b/src/grib_accessor_class_getenv.cc @@ -105,12 +105,6 @@ static grib_accessor_class _grib_accessor_class_getenv = { grib_accessor_class* grib_accessor_class_getenv = &_grib_accessor_class_getenv; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* args) diff --git a/src/grib_accessor_class_global_gaussian.cc b/src/grib_accessor_class_global_gaussian.cc index 361b0002e..b765d7066 100644 --- a/src/grib_accessor_class_global_gaussian.cc +++ b/src/grib_accessor_class_global_gaussian.cc @@ -120,12 +120,6 @@ static grib_accessor_class _grib_accessor_class_global_gaussian = { grib_accessor_class* grib_accessor_class_global_gaussian = &_grib_accessor_class_global_gaussian; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_group.cc b/src/grib_accessor_class_group.cc index aeda32ec4..ae8fd6ce1 100644 --- a/src/grib_accessor_class_group.cc +++ b/src/grib_accessor_class_group.cc @@ -118,12 +118,6 @@ static grib_accessor_class _grib_accessor_class_group = { grib_accessor_class* grib_accessor_class_group = &_grib_accessor_class_group; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_gts_header.cc b/src/grib_accessor_class_gts_header.cc index 8d55109a0..2b7f65732 100644 --- a/src/grib_accessor_class_gts_header.cc +++ b/src/grib_accessor_class_gts_header.cc @@ -103,12 +103,6 @@ static grib_accessor_class _grib_accessor_class_gts_header = { grib_accessor_class* grib_accessor_class_gts_header = &_grib_accessor_class_gts_header; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_hash_array.cc b/src/grib_accessor_class_hash_array.cc index 2d11202de..d4d4facb6 100644 --- a/src/grib_accessor_class_hash_array.cc +++ b/src/grib_accessor_class_hash_array.cc @@ -119,12 +119,6 @@ static grib_accessor_class _grib_accessor_class_hash_array = { grib_accessor_class* grib_accessor_class_hash_array = &_grib_accessor_class_hash_array; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ #define MAX_HASH_ARRAY_STRING_LENGTH 255 diff --git a/src/grib_accessor_class_headers_only.cc b/src/grib_accessor_class_headers_only.cc index 152ee2407..8e916886b 100644 --- a/src/grib_accessor_class_headers_only.cc +++ b/src/grib_accessor_class_headers_only.cc @@ -95,12 +95,6 @@ static grib_accessor_class _grib_accessor_class_headers_only = { grib_accessor_class* grib_accessor_class_headers_only = &_grib_accessor_class_headers_only; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_ibmfloat.cc b/src/grib_accessor_class_ibmfloat.cc index 762149fd1..cae1a8baf 100644 --- a/src/grib_accessor_class_ibmfloat.cc +++ b/src/grib_accessor_class_ibmfloat.cc @@ -115,12 +115,6 @@ static grib_accessor_class _grib_accessor_class_ibmfloat = { grib_accessor_class* grib_accessor_class_ibmfloat = &_grib_accessor_class_ibmfloat; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_ieeefloat.cc b/src/grib_accessor_class_ieeefloat.cc index 8857484ba..8a0520ab6 100644 --- a/src/grib_accessor_class_ieeefloat.cc +++ b/src/grib_accessor_class_ieeefloat.cc @@ -108,12 +108,6 @@ static grib_accessor_class _grib_accessor_class_ieeefloat = { grib_accessor_class* grib_accessor_class_ieeefloat = &_grib_accessor_class_ieeefloat; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_ifs_param.cc b/src/grib_accessor_class_ifs_param.cc index 5fc275f63..9cb52aa39 100644 --- a/src/grib_accessor_class_ifs_param.cc +++ b/src/grib_accessor_class_ifs_param.cc @@ -106,12 +106,6 @@ static grib_accessor_class _grib_accessor_class_ifs_param = { grib_accessor_class* grib_accessor_class_ifs_param = &_grib_accessor_class_ifs_param; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_int16.cc b/src/grib_accessor_class_int16.cc index 5906a65b7..2e1ec6553 100644 --- a/src/grib_accessor_class_int16.cc +++ b/src/grib_accessor_class_int16.cc @@ -96,12 +96,6 @@ static grib_accessor_class _grib_accessor_class_int16 = { grib_accessor_class* grib_accessor_class_int16 = &_grib_accessor_class_int16; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_long(grib_accessor* a, long* val, size_t* len) diff --git a/src/grib_accessor_class_int16_little_endian.cc b/src/grib_accessor_class_int16_little_endian.cc index 8230e8042..f813177e0 100644 --- a/src/grib_accessor_class_int16_little_endian.cc +++ b/src/grib_accessor_class_int16_little_endian.cc @@ -96,12 +96,6 @@ static grib_accessor_class _grib_accessor_class_int16_little_endian = { grib_accessor_class* grib_accessor_class_int16_little_endian = &_grib_accessor_class_int16_little_endian; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_long(grib_accessor* a, long* val, size_t* len) diff --git a/src/grib_accessor_class_int32.cc b/src/grib_accessor_class_int32.cc index e3b9834e0..6a388d32d 100644 --- a/src/grib_accessor_class_int32.cc +++ b/src/grib_accessor_class_int32.cc @@ -96,12 +96,6 @@ static grib_accessor_class _grib_accessor_class_int32 = { grib_accessor_class* grib_accessor_class_int32 = &_grib_accessor_class_int32; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_long(grib_accessor* a, long* val, size_t* len) diff --git a/src/grib_accessor_class_int32_little_endian.cc b/src/grib_accessor_class_int32_little_endian.cc index 4813d9b01..93e7debcb 100644 --- a/src/grib_accessor_class_int32_little_endian.cc +++ b/src/grib_accessor_class_int32_little_endian.cc @@ -96,12 +96,6 @@ static grib_accessor_class _grib_accessor_class_int32_little_endian = { grib_accessor_class* grib_accessor_class_int32_little_endian = &_grib_accessor_class_int32_little_endian; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_long(grib_accessor* a, long* val, size_t* len) diff --git a/src/grib_accessor_class_int64.cc b/src/grib_accessor_class_int64.cc index 2f32552b4..651711e29 100644 --- a/src/grib_accessor_class_int64.cc +++ b/src/grib_accessor_class_int64.cc @@ -96,12 +96,6 @@ static grib_accessor_class _grib_accessor_class_int64 = { grib_accessor_class* grib_accessor_class_int64 = &_grib_accessor_class_int64; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_long(grib_accessor* a, long* val, size_t* len) diff --git a/src/grib_accessor_class_int64_little_endian.cc b/src/grib_accessor_class_int64_little_endian.cc index 4212db3c0..23e7ec02f 100644 --- a/src/grib_accessor_class_int64_little_endian.cc +++ b/src/grib_accessor_class_int64_little_endian.cc @@ -96,12 +96,6 @@ static grib_accessor_class _grib_accessor_class_int64_little_endian = { grib_accessor_class* grib_accessor_class_int64_little_endian = &_grib_accessor_class_int64_little_endian; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_long(grib_accessor* a, long* val, size_t* len) diff --git a/src/grib_accessor_class_int8.cc b/src/grib_accessor_class_int8.cc index b45b912f6..6c8636ab1 100644 --- a/src/grib_accessor_class_int8.cc +++ b/src/grib_accessor_class_int8.cc @@ -96,12 +96,6 @@ static grib_accessor_class _grib_accessor_class_int8 = { grib_accessor_class* grib_accessor_class_int8 = &_grib_accessor_class_int8; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_long(grib_accessor* a, long* val, size_t* len) diff --git a/src/grib_accessor_class_iterator.cc b/src/grib_accessor_class_iterator.cc index ec0ff29d1..29585f4c6 100644 --- a/src/grib_accessor_class_iterator.cc +++ b/src/grib_accessor_class_iterator.cc @@ -100,12 +100,6 @@ static grib_accessor_class _grib_accessor_class_iterator = { grib_accessor_class* grib_accessor_class_iterator = &_grib_accessor_class_iterator; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* args) diff --git a/src/grib_accessor_class_julian_date.cc b/src/grib_accessor_class_julian_date.cc index e53b81455..e2c85494a 100644 --- a/src/grib_accessor_class_julian_date.cc +++ b/src/grib_accessor_class_julian_date.cc @@ -126,12 +126,6 @@ static grib_accessor_class _grib_accessor_class_julian_date = { grib_accessor_class* grib_accessor_class_julian_date = &_grib_accessor_class_julian_date; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_julian_day.cc b/src/grib_accessor_class_julian_day.cc index 74367f5e9..8824128b1 100644 --- a/src/grib_accessor_class_julian_day.cc +++ b/src/grib_accessor_class_julian_day.cc @@ -111,12 +111,6 @@ static grib_accessor_class _grib_accessor_class_julian_day = { grib_accessor_class* grib_accessor_class_julian_day = &_grib_accessor_class_julian_day; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_ksec1expver.cc b/src/grib_accessor_class_ksec1expver.cc index dcee3553c..2c19e5210 100644 --- a/src/grib_accessor_class_ksec1expver.cc +++ b/src/grib_accessor_class_ksec1expver.cc @@ -100,12 +100,6 @@ static grib_accessor_class _grib_accessor_class_ksec1expver = { grib_accessor_class* grib_accessor_class_ksec1expver = &_grib_accessor_class_ksec1expver; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_label.cc b/src/grib_accessor_class_label.cc index a38848761..d66ecd4d5 100644 --- a/src/grib_accessor_class_label.cc +++ b/src/grib_accessor_class_label.cc @@ -98,12 +98,6 @@ static grib_accessor_class _grib_accessor_class_label = { grib_accessor_class* grib_accessor_class_label = &_grib_accessor_class_label; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_laplacian.cc b/src/grib_accessor_class_laplacian.cc index 49d82db4a..55a4ef527 100644 --- a/src/grib_accessor_class_laplacian.cc +++ b/src/grib_accessor_class_laplacian.cc @@ -110,12 +110,6 @@ static grib_accessor_class _grib_accessor_class_laplacian = { grib_accessor_class* grib_accessor_class_laplacian = &_grib_accessor_class_laplacian; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_latitudes.cc b/src/grib_accessor_class_latitudes.cc index b4a99110c..a1b6095b7 100644 --- a/src/grib_accessor_class_latitudes.cc +++ b/src/grib_accessor_class_latitudes.cc @@ -108,12 +108,6 @@ static grib_accessor_class _grib_accessor_class_latitudes = { grib_accessor_class* grib_accessor_class_latitudes = &_grib_accessor_class_latitudes; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_latlon_increment.cc b/src/grib_accessor_class_latlon_increment.cc index faf62d864..5a45288bc 100644 --- a/src/grib_accessor_class_latlon_increment.cc +++ b/src/grib_accessor_class_latlon_increment.cc @@ -116,12 +116,6 @@ static grib_accessor_class _grib_accessor_class_latlon_increment = { grib_accessor_class* grib_accessor_class_latlon_increment = &_grib_accessor_class_latlon_increment; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) @@ -293,10 +287,8 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len) } } - /*ret = grib_set_long_internal(hand, self->numberOfPoints,numberOfPoints); - if(ret) - grib_context_log(a->context, GRIB_LOG_ERROR, "Accessor %s cannot pack value for %s error %d \n", a->name, self->numberOfPoints, ret); - */ + //ret = grib_set_long_internal(hand, self->numberOfPoints,numberOfPoints); + //if(ret) grib_context_log(a->context, GRIB_LOG_ERROR, "Accessor %s cannot pack value for %s error %d \n", a->name, self->numberOfPoints, ret); grib_get_long_internal(hand, self->numberOfPoints, &codedNumberOfPoints); diff --git a/src/grib_accessor_class_latlonvalues.cc b/src/grib_accessor_class_latlonvalues.cc index 140f52266..82f26288d 100644 --- a/src/grib_accessor_class_latlonvalues.cc +++ b/src/grib_accessor_class_latlonvalues.cc @@ -100,12 +100,6 @@ static grib_accessor_class _grib_accessor_class_latlonvalues = { grib_accessor_class* grib_accessor_class_latlonvalues = &_grib_accessor_class_latlonvalues; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_library_version.cc b/src/grib_accessor_class_library_version.cc index ef6170715..f205c9f31 100644 --- a/src/grib_accessor_class_library_version.cc +++ b/src/grib_accessor_class_library_version.cc @@ -96,12 +96,6 @@ static grib_accessor_class _grib_accessor_class_library_version = { grib_accessor_class* grib_accessor_class_library_version = &_grib_accessor_class_library_version; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_string(grib_accessor* a, char* val, size_t* len) diff --git a/src/grib_accessor_class_local_definition.cc b/src/grib_accessor_class_local_definition.cc index 635abe14e..81476efed 100644 --- a/src/grib_accessor_class_local_definition.cc +++ b/src/grib_accessor_class_local_definition.cc @@ -123,12 +123,6 @@ static grib_accessor_class _grib_accessor_class_local_definition = { grib_accessor_class* grib_accessor_class_local_definition = &_grib_accessor_class_local_definition; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_long.cc b/src/grib_accessor_class_long.cc index 5b650776b..de06da13c 100644 --- a/src/grib_accessor_class_long.cc +++ b/src/grib_accessor_class_long.cc @@ -103,12 +103,6 @@ static grib_accessor_class _grib_accessor_class_long = { grib_accessor_class* grib_accessor_class_long = &_grib_accessor_class_long; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int get_native_type(grib_accessor* a) diff --git a/src/grib_accessor_class_long_vector.cc b/src/grib_accessor_class_long_vector.cc index 7a6d54322..b397e00e4 100644 --- a/src/grib_accessor_class_long_vector.cc +++ b/src/grib_accessor_class_long_vector.cc @@ -112,12 +112,6 @@ static grib_accessor_class _grib_accessor_class_long_vector = { grib_accessor_class* grib_accessor_class_long_vector = &_grib_accessor_class_long_vector; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ typedef struct grib_accessor_abstract_long_vector diff --git a/src/grib_accessor_class_longitudes.cc b/src/grib_accessor_class_longitudes.cc index 6b929cf05..14bcaaf8a 100644 --- a/src/grib_accessor_class_longitudes.cc +++ b/src/grib_accessor_class_longitudes.cc @@ -108,12 +108,6 @@ static grib_accessor_class _grib_accessor_class_longitudes = { grib_accessor_class* grib_accessor_class_longitudes = &_grib_accessor_class_longitudes; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_lookup.cc b/src/grib_accessor_class_lookup.cc index cded53ac4..4a83b79a5 100644 --- a/src/grib_accessor_class_lookup.cc +++ b/src/grib_accessor_class_lookup.cc @@ -113,12 +113,6 @@ static grib_accessor_class _grib_accessor_class_lookup = { grib_accessor_class* grib_accessor_class_lookup = &_grib_accessor_class_lookup; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_mars_param.cc b/src/grib_accessor_class_mars_param.cc index ae4e5b1a1..07b15ce63 100644 --- a/src/grib_accessor_class_mars_param.cc +++ b/src/grib_accessor_class_mars_param.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_mars_param = { grib_accessor_class* grib_accessor_class_mars_param = &_grib_accessor_class_mars_param; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_mars_step.cc b/src/grib_accessor_class_mars_step.cc index e9d030383..e1f8c0786 100644 --- a/src/grib_accessor_class_mars_step.cc +++ b/src/grib_accessor_class_mars_step.cc @@ -108,12 +108,6 @@ static grib_accessor_class _grib_accessor_class_mars_step = { grib_accessor_class* grib_accessor_class_mars_step = &_grib_accessor_class_mars_step; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_md5.cc b/src/grib_accessor_class_md5.cc index 05f5ec9f6..58477a5d7 100644 --- a/src/grib_accessor_class_md5.cc +++ b/src/grib_accessor_class_md5.cc @@ -106,12 +106,6 @@ static grib_accessor_class _grib_accessor_class_md5 = { grib_accessor_class* grib_accessor_class_md5 = &_grib_accessor_class_md5; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_message.cc b/src/grib_accessor_class_message.cc index 0b02df2f5..467ffbe6c 100644 --- a/src/grib_accessor_class_message.cc +++ b/src/grib_accessor_class_message.cc @@ -106,12 +106,6 @@ static grib_accessor_class _grib_accessor_class_message = { grib_accessor_class* grib_accessor_class_message = &_grib_accessor_class_message; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_message_copy.cc b/src/grib_accessor_class_message_copy.cc index 127e8092f..e4fce362a 100644 --- a/src/grib_accessor_class_message_copy.cc +++ b/src/grib_accessor_class_message_copy.cc @@ -101,12 +101,6 @@ static grib_accessor_class _grib_accessor_class_message_copy = { grib_accessor_class* grib_accessor_class_message_copy = &_grib_accessor_class_message_copy; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long length, grib_arguments* args) diff --git a/src/grib_accessor_class_missing.cc b/src/grib_accessor_class_missing.cc index a0e0bdbbd..5d4ca2d91 100644 --- a/src/grib_accessor_class_missing.cc +++ b/src/grib_accessor_class_missing.cc @@ -122,12 +122,6 @@ static grib_accessor_class _grib_accessor_class_missing = { grib_accessor_class* grib_accessor_class_missing = &_grib_accessor_class_missing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* param) diff --git a/src/grib_accessor_class_nearest.cc b/src/grib_accessor_class_nearest.cc index f04fb901c..bfbfaa8d1 100644 --- a/src/grib_accessor_class_nearest.cc +++ b/src/grib_accessor_class_nearest.cc @@ -96,12 +96,6 @@ static grib_accessor_class _grib_accessor_class_nearest = { grib_accessor_class* grib_accessor_class_nearest = &_grib_accessor_class_nearest; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* args) diff --git a/src/grib_accessor_class_non_alpha.cc b/src/grib_accessor_class_non_alpha.cc index bfdcc02d3..042f65851 100644 --- a/src/grib_accessor_class_non_alpha.cc +++ b/src/grib_accessor_class_non_alpha.cc @@ -115,12 +115,6 @@ static grib_accessor_class _grib_accessor_class_non_alpha = { grib_accessor_class* grib_accessor_class_non_alpha = &_grib_accessor_class_non_alpha; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_number_of_coded_values.cc b/src/grib_accessor_class_number_of_coded_values.cc index 04dfcf347..af1925fbe 100644 --- a/src/grib_accessor_class_number_of_coded_values.cc +++ b/src/grib_accessor_class_number_of_coded_values.cc @@ -109,12 +109,6 @@ static grib_accessor_class _grib_accessor_class_number_of_coded_values = { grib_accessor_class* grib_accessor_class_number_of_coded_values = &_grib_accessor_class_number_of_coded_values; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_number_of_points.cc b/src/grib_accessor_class_number_of_points.cc index 938970ad7..26365b340 100644 --- a/src/grib_accessor_class_number_of_points.cc +++ b/src/grib_accessor_class_number_of_points.cc @@ -107,12 +107,6 @@ static grib_accessor_class _grib_accessor_class_number_of_points = { grib_accessor_class* grib_accessor_class_number_of_points = &_grib_accessor_class_number_of_points; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_number_of_points_gaussian.cc b/src/grib_accessor_class_number_of_points_gaussian.cc index 42dba0515..5f9540284 100644 --- a/src/grib_accessor_class_number_of_points_gaussian.cc +++ b/src/grib_accessor_class_number_of_points_gaussian.cc @@ -121,12 +121,6 @@ static grib_accessor_class _grib_accessor_class_number_of_points_gaussian = { grib_accessor_class* grib_accessor_class_number_of_points_gaussian = &_grib_accessor_class_number_of_points_gaussian; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ #define EFDEBUG 0 diff --git a/src/grib_accessor_class_number_of_values.cc b/src/grib_accessor_class_number_of_values.cc index d853a9cb9..bdc2b2b42 100644 --- a/src/grib_accessor_class_number_of_values.cc +++ b/src/grib_accessor_class_number_of_values.cc @@ -111,12 +111,6 @@ static grib_accessor_class _grib_accessor_class_number_of_values = { grib_accessor_class* grib_accessor_class_number_of_values = &_grib_accessor_class_number_of_values; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_number_of_values_data_raw_packing.cc b/src/grib_accessor_class_number_of_values_data_raw_packing.cc index 5d038d7ff..fae4a3258 100644 --- a/src/grib_accessor_class_number_of_values_data_raw_packing.cc +++ b/src/grib_accessor_class_number_of_values_data_raw_packing.cc @@ -113,12 +113,6 @@ static grib_accessor_class _grib_accessor_class_number_of_values_data_raw_packin grib_accessor_class* grib_accessor_class_number_of_values_data_raw_packing = &_grib_accessor_class_number_of_values_data_raw_packing; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long v, grib_arguments* args) diff --git a/src/grib_accessor_class_octahedral_gaussian.cc b/src/grib_accessor_class_octahedral_gaussian.cc index 355879545..482bf7af0 100644 --- a/src/grib_accessor_class_octahedral_gaussian.cc +++ b/src/grib_accessor_class_octahedral_gaussian.cc @@ -107,12 +107,6 @@ static grib_accessor_class _grib_accessor_class_octahedral_gaussian = { grib_accessor_class* grib_accessor_class_octahedral_gaussian = &_grib_accessor_class_octahedral_gaussian; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_octet_number.cc b/src/grib_accessor_class_octet_number.cc index 917da92d3..4b8bdeb8a 100644 --- a/src/grib_accessor_class_octet_number.cc +++ b/src/grib_accessor_class_octet_number.cc @@ -105,12 +105,6 @@ static grib_accessor_class _grib_accessor_class_octet_number = { grib_accessor_class* grib_accessor_class_octet_number = &_grib_accessor_class_octet_number; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_offset_file.cc b/src/grib_accessor_class_offset_file.cc index 3fb90643c..d672a3dc3 100644 --- a/src/grib_accessor_class_offset_file.cc +++ b/src/grib_accessor_class_offset_file.cc @@ -101,12 +101,6 @@ static grib_accessor_class _grib_accessor_class_offset_file = { grib_accessor_class* grib_accessor_class_offset_file = &_grib_accessor_class_offset_file; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_offset_values.cc b/src/grib_accessor_class_offset_values.cc index 0a65f0c4c..681a5c00a 100644 --- a/src/grib_accessor_class_offset_values.cc +++ b/src/grib_accessor_class_offset_values.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_offset_values = { grib_accessor_class* grib_accessor_class_offset_values = &_grib_accessor_class_offset_values; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* args) diff --git a/src/grib_accessor_class_pack_bufr_values.cc b/src/grib_accessor_class_pack_bufr_values.cc index 1d8d52d5a..af7b43ec9 100644 --- a/src/grib_accessor_class_pack_bufr_values.cc +++ b/src/grib_accessor_class_pack_bufr_values.cc @@ -110,12 +110,6 @@ static grib_accessor_class _grib_accessor_class_pack_bufr_values = { grib_accessor_class* grib_accessor_class_pack_bufr_values = &_grib_accessor_class_pack_bufr_values; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* params) diff --git a/src/grib_accessor_class_pad.cc b/src/grib_accessor_class_pad.cc index 07d33bb42..fe969c4c3 100644 --- a/src/grib_accessor_class_pad.cc +++ b/src/grib_accessor_class_pad.cc @@ -103,12 +103,6 @@ static grib_accessor_class _grib_accessor_class_pad = { grib_accessor_class* grib_accessor_class_pad = &_grib_accessor_class_pad; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_padding.cc b/src/grib_accessor_class_padding.cc index e8d299df3..06a56b6b6 100644 --- a/src/grib_accessor_class_padding.cc +++ b/src/grib_accessor_class_padding.cc @@ -105,12 +105,6 @@ static grib_accessor_class _grib_accessor_class_padding = { grib_accessor_class* grib_accessor_class_padding = &_grib_accessor_class_padding; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_padto.cc b/src/grib_accessor_class_padto.cc index 27cc1a609..221f63cfc 100644 --- a/src/grib_accessor_class_padto.cc +++ b/src/grib_accessor_class_padto.cc @@ -103,12 +103,6 @@ static grib_accessor_class _grib_accessor_class_padto = { grib_accessor_class* grib_accessor_class_padto = &_grib_accessor_class_padto; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_padtoeven.cc b/src/grib_accessor_class_padtoeven.cc index 5defb7f96..67cd553f5 100644 --- a/src/grib_accessor_class_padtoeven.cc +++ b/src/grib_accessor_class_padtoeven.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_padtoeven = { grib_accessor_class* grib_accessor_class_padtoeven = &_grib_accessor_class_padtoeven; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static size_t preferred_size(grib_accessor* a, int from_handle) diff --git a/src/grib_accessor_class_padtomultiple.cc b/src/grib_accessor_class_padtomultiple.cc index e6974c11d..89100808c 100644 --- a/src/grib_accessor_class_padtomultiple.cc +++ b/src/grib_accessor_class_padtomultiple.cc @@ -105,12 +105,6 @@ static grib_accessor_class _grib_accessor_class_padtomultiple = { grib_accessor_class* grib_accessor_class_padtomultiple = &_grib_accessor_class_padtomultiple; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static size_t preferred_size(grib_accessor* a, int from_handle) diff --git a/src/grib_accessor_class_position.cc b/src/grib_accessor_class_position.cc index 061dd9c7a..a14385523 100644 --- a/src/grib_accessor_class_position.cc +++ b/src/grib_accessor_class_position.cc @@ -105,12 +105,6 @@ static grib_accessor_class _grib_accessor_class_position = { grib_accessor_class* grib_accessor_class_position = &_grib_accessor_class_position; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_proj_string.cc b/src/grib_accessor_class_proj_string.cc index 49d5fee37..bbeae4ae3 100644 --- a/src/grib_accessor_class_proj_string.cc +++ b/src/grib_accessor_class_proj_string.cc @@ -100,12 +100,6 @@ static grib_accessor_class _grib_accessor_class_proj_string = { grib_accessor_class* grib_accessor_class_proj_string = &_grib_accessor_class_proj_string; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_raw.cc b/src/grib_accessor_class_raw.cc index d078ac57d..d3a1203ff 100644 --- a/src/grib_accessor_class_raw.cc +++ b/src/grib_accessor_class_raw.cc @@ -107,12 +107,6 @@ static grib_accessor_class _grib_accessor_class_raw = { grib_accessor_class* grib_accessor_class_raw = &_grib_accessor_class_raw; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_rdbtime_guess_date.cc b/src/grib_accessor_class_rdbtime_guess_date.cc index 130ede124..eb94db18f 100644 --- a/src/grib_accessor_class_rdbtime_guess_date.cc +++ b/src/grib_accessor_class_rdbtime_guess_date.cc @@ -109,12 +109,6 @@ static grib_accessor_class _grib_accessor_class_rdbtime_guess_date = { grib_accessor_class* grib_accessor_class_rdbtime_guess_date = &_grib_accessor_class_rdbtime_guess_date; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_reference_value_error.cc b/src/grib_accessor_class_reference_value_error.cc index 3dc73b09c..fe4ee60d5 100644 --- a/src/grib_accessor_class_reference_value_error.cc +++ b/src/grib_accessor_class_reference_value_error.cc @@ -105,12 +105,6 @@ static grib_accessor_class _grib_accessor_class_reference_value_error = { grib_accessor_class* grib_accessor_class_reference_value_error = &_grib_accessor_class_reference_value_error; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_round.cc b/src/grib_accessor_class_round.cc index 629dcd359..c6ffc6f62 100644 --- a/src/grib_accessor_class_round.cc +++ b/src/grib_accessor_class_round.cc @@ -98,12 +98,6 @@ static grib_accessor_class _grib_accessor_class_round = { grib_accessor_class* grib_accessor_class_round = &_grib_accessor_class_round; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_double(grib_accessor* a, double* val, size_t* len) diff --git a/src/grib_accessor_class_scale.cc b/src/grib_accessor_class_scale.cc index 2396680df..56a8ade01 100644 --- a/src/grib_accessor_class_scale.cc +++ b/src/grib_accessor_class_scale.cc @@ -113,12 +113,6 @@ static grib_accessor_class _grib_accessor_class_scale = { grib_accessor_class* grib_accessor_class_scale = &_grib_accessor_class_scale; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_scale_values.cc b/src/grib_accessor_class_scale_values.cc index 96efcab0f..659dcafae 100644 --- a/src/grib_accessor_class_scale_values.cc +++ b/src/grib_accessor_class_scale_values.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_scale_values = { grib_accessor_class* grib_accessor_class_scale_values = &_grib_accessor_class_scale_values; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* args) diff --git a/src/grib_accessor_class_second_order_bits_per_value.cc b/src/grib_accessor_class_second_order_bits_per_value.cc index d4f22423d..45ab8862d 100644 --- a/src/grib_accessor_class_second_order_bits_per_value.cc +++ b/src/grib_accessor_class_second_order_bits_per_value.cc @@ -110,12 +110,6 @@ static grib_accessor_class _grib_accessor_class_second_order_bits_per_value = { grib_accessor_class* grib_accessor_class_second_order_bits_per_value = &_grib_accessor_class_second_order_bits_per_value; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static const size_t nbits[64] = { diff --git a/src/grib_accessor_class_section.cc b/src/grib_accessor_class_section.cc index 551a7d95e..32bf63f08 100644 --- a/src/grib_accessor_class_section.cc +++ b/src/grib_accessor_class_section.cc @@ -106,12 +106,6 @@ static grib_accessor_class _grib_accessor_class_section = { grib_accessor_class* grib_accessor_class_section = &_grib_accessor_class_section; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_section_length.cc b/src/grib_accessor_class_section_length.cc index 5cbc8eb04..30dfc21d2 100644 --- a/src/grib_accessor_class_section_length.cc +++ b/src/grib_accessor_class_section_length.cc @@ -100,12 +100,6 @@ static grib_accessor_class _grib_accessor_class_section_length = { grib_accessor_class* grib_accessor_class_section_length = &_grib_accessor_class_section_length; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_section_padding.cc b/src/grib_accessor_class_section_padding.cc index 553899a1b..952d4487c 100644 --- a/src/grib_accessor_class_section_padding.cc +++ b/src/grib_accessor_class_section_padding.cc @@ -98,12 +98,6 @@ static grib_accessor_class _grib_accessor_class_section_padding = { grib_accessor_class* grib_accessor_class_section_padding = &_grib_accessor_class_section_padding; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static size_t preferred_size(grib_accessor* a, int from_handle) diff --git a/src/grib_accessor_class_section_pointer.cc b/src/grib_accessor_class_section_pointer.cc index c967f001e..c4186db6e 100644 --- a/src/grib_accessor_class_section_pointer.cc +++ b/src/grib_accessor_class_section_pointer.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_section_pointer = { grib_accessor_class* grib_accessor_class_section_pointer = &_grib_accessor_class_section_pointer; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_select_step_template.cc b/src/grib_accessor_class_select_step_template.cc index 6ec5a1777..4184514e6 100644 --- a/src/grib_accessor_class_select_step_template.cc +++ b/src/grib_accessor_class_select_step_template.cc @@ -106,12 +106,6 @@ static grib_accessor_class _grib_accessor_class_select_step_template = { grib_accessor_class* grib_accessor_class_select_step_template = &_grib_accessor_class_select_step_template; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_sexagesimal2decimal.cc b/src/grib_accessor_class_sexagesimal2decimal.cc index d13583433..028e92335 100644 --- a/src/grib_accessor_class_sexagesimal2decimal.cc +++ b/src/grib_accessor_class_sexagesimal2decimal.cc @@ -106,12 +106,6 @@ static grib_accessor_class _grib_accessor_class_sexagesimal2decimal = { grib_accessor_class* grib_accessor_class_sexagesimal2decimal = &_grib_accessor_class_sexagesimal2decimal; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_signed.cc b/src/grib_accessor_class_signed.cc index ac00c14e7..04c9e4ae5 100644 --- a/src/grib_accessor_class_signed.cc +++ b/src/grib_accessor_class_signed.cc @@ -114,12 +114,6 @@ static grib_accessor_class _grib_accessor_class_signed = { grib_accessor_class* grib_accessor_class_signed = &_grib_accessor_class_signed; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_signed_bits.cc b/src/grib_accessor_class_signed_bits.cc index ebd0cafc6..ce258b524 100644 --- a/src/grib_accessor_class_signed_bits.cc +++ b/src/grib_accessor_class_signed_bits.cc @@ -113,12 +113,6 @@ static grib_accessor_class _grib_accessor_class_signed_bits = { grib_accessor_class* grib_accessor_class_signed_bits = &_grib_accessor_class_signed_bits; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static long byte_count(grib_accessor* a) diff --git a/src/grib_accessor_class_simple_packing_error.cc b/src/grib_accessor_class_simple_packing_error.cc index 9118b4e59..835b2e7e5 100644 --- a/src/grib_accessor_class_simple_packing_error.cc +++ b/src/grib_accessor_class_simple_packing_error.cc @@ -112,12 +112,6 @@ static grib_accessor_class _grib_accessor_class_simple_packing_error = { grib_accessor_class* grib_accessor_class_simple_packing_error = &_grib_accessor_class_simple_packing_error; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_size.cc b/src/grib_accessor_class_size.cc index 7bea5b7d3..f2cf0c297 100644 --- a/src/grib_accessor_class_size.cc +++ b/src/grib_accessor_class_size.cc @@ -97,12 +97,6 @@ static grib_accessor_class _grib_accessor_class_size = { grib_accessor_class* grib_accessor_class_size = &_grib_accessor_class_size; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_smart_table.cc b/src/grib_accessor_class_smart_table.cc index 1aaece487..62d7ecc86 100644 --- a/src/grib_accessor_class_smart_table.cc +++ b/src/grib_accessor_class_smart_table.cc @@ -132,12 +132,6 @@ static grib_accessor_class _grib_accessor_class_smart_table = { grib_accessor_class* grib_accessor_class_smart_table = &_grib_accessor_class_smart_table; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ #if GRIB_PTHREADS diff --git a/src/grib_accessor_class_smart_table_column.cc b/src/grib_accessor_class_smart_table_column.cc index d1dd0009c..097e34661 100644 --- a/src/grib_accessor_class_smart_table_column.cc +++ b/src/grib_accessor_class_smart_table_column.cc @@ -105,12 +105,6 @@ static grib_accessor_class _grib_accessor_class_smart_table_column = { grib_accessor_class* grib_accessor_class_smart_table_column = &_grib_accessor_class_smart_table_column; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ typedef struct grib_accessor_smart_table diff --git a/src/grib_accessor_class_spd.cc b/src/grib_accessor_class_spd.cc index e5a59e6d2..13f75f130 100644 --- a/src/grib_accessor_class_spd.cc +++ b/src/grib_accessor_class_spd.cc @@ -113,12 +113,6 @@ static grib_accessor_class _grib_accessor_class_spd = { grib_accessor_class* grib_accessor_class_spd = &_grib_accessor_class_spd; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static long byte_count(grib_accessor* a) diff --git a/src/grib_accessor_class_spectral_truncation.cc b/src/grib_accessor_class_spectral_truncation.cc index 730e5fe4e..72f4c6c64 100644 --- a/src/grib_accessor_class_spectral_truncation.cc +++ b/src/grib_accessor_class_spectral_truncation.cc @@ -109,12 +109,6 @@ static grib_accessor_class _grib_accessor_class_spectral_truncation = { grib_accessor_class* grib_accessor_class_spectral_truncation = &_grib_accessor_class_spectral_truncation; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_sprintf.cc b/src/grib_accessor_class_sprintf.cc index e735e758a..d7ad9b9f7 100644 --- a/src/grib_accessor_class_sprintf.cc +++ b/src/grib_accessor_class_sprintf.cc @@ -101,12 +101,6 @@ static grib_accessor_class _grib_accessor_class_sprintf = { grib_accessor_class* grib_accessor_class_sprintf = &_grib_accessor_class_sprintf; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_statistics.cc b/src/grib_accessor_class_statistics.cc index cb90519fe..7a0c1c72d 100644 --- a/src/grib_accessor_class_statistics.cc +++ b/src/grib_accessor_class_statistics.cc @@ -114,12 +114,6 @@ static grib_accessor_class _grib_accessor_class_statistics = { grib_accessor_class* grib_accessor_class_statistics = &_grib_accessor_class_statistics; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_statistics_spectral.cc b/src/grib_accessor_class_statistics_spectral.cc index 205a9bc8c..8643d7703 100644 --- a/src/grib_accessor_class_statistics_spectral.cc +++ b/src/grib_accessor_class_statistics_spectral.cc @@ -118,12 +118,6 @@ static grib_accessor_class _grib_accessor_class_statistics_spectral = { grib_accessor_class* grib_accessor_class_statistics_spectral = &_grib_accessor_class_statistics_spectral; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_step_human_readable.cc b/src/grib_accessor_class_step_human_readable.cc index e1da574c1..a11bb7fb7 100644 --- a/src/grib_accessor_class_step_human_readable.cc +++ b/src/grib_accessor_class_step_human_readable.cc @@ -100,12 +100,6 @@ static grib_accessor_class _grib_accessor_class_step_human_readable = { grib_accessor_class* grib_accessor_class_step_human_readable = &_grib_accessor_class_step_human_readable; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* params) diff --git a/src/grib_accessor_class_step_in_units.cc b/src/grib_accessor_class_step_in_units.cc index 38fcd03e3..36f98dc91 100644 --- a/src/grib_accessor_class_step_in_units.cc +++ b/src/grib_accessor_class_step_in_units.cc @@ -109,12 +109,6 @@ static grib_accessor_class _grib_accessor_class_step_in_units = { grib_accessor_class* grib_accessor_class_step_in_units = &_grib_accessor_class_step_in_units; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_sum.cc b/src/grib_accessor_class_sum.cc index a3a330f27..a1016b5b0 100644 --- a/src/grib_accessor_class_sum.cc +++ b/src/grib_accessor_class_sum.cc @@ -107,12 +107,6 @@ static grib_accessor_class _grib_accessor_class_sum = { grib_accessor_class* grib_accessor_class_sum = &_grib_accessor_class_sum; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_suppressed.cc b/src/grib_accessor_class_suppressed.cc index fc868673c..392441377 100644 --- a/src/grib_accessor_class_suppressed.cc +++ b/src/grib_accessor_class_suppressed.cc @@ -108,12 +108,6 @@ static grib_accessor_class _grib_accessor_class_suppressed = { grib_accessor_class* grib_accessor_class_suppressed = &_grib_accessor_class_suppressed; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_time.cc b/src/grib_accessor_class_time.cc index bdf574cff..344498bff 100644 --- a/src/grib_accessor_class_time.cc +++ b/src/grib_accessor_class_time.cc @@ -107,12 +107,6 @@ static grib_accessor_class _grib_accessor_class_time = { grib_accessor_class* grib_accessor_class_time = &_grib_accessor_class_time; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_times.cc b/src/grib_accessor_class_times.cc index 6e8085971..5801c0088 100644 --- a/src/grib_accessor_class_times.cc +++ b/src/grib_accessor_class_times.cc @@ -107,12 +107,6 @@ static grib_accessor_class _grib_accessor_class_times = { grib_accessor_class* grib_accessor_class_times = &_grib_accessor_class_times; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* c) diff --git a/src/grib_accessor_class_to_double.cc b/src/grib_accessor_class_to_double.cc index a561f6aab..30f57ef9f 100644 --- a/src/grib_accessor_class_to_double.cc +++ b/src/grib_accessor_class_to_double.cc @@ -123,12 +123,6 @@ static grib_accessor_class _grib_accessor_class_to_double = { grib_accessor_class* grib_accessor_class_to_double = &_grib_accessor_class_to_double; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_to_integer.cc b/src/grib_accessor_class_to_integer.cc index d9cb9a573..821eeda0d 100644 --- a/src/grib_accessor_class_to_integer.cc +++ b/src/grib_accessor_class_to_integer.cc @@ -121,12 +121,6 @@ static grib_accessor_class _grib_accessor_class_to_integer = { grib_accessor_class* grib_accessor_class_to_integer = &_grib_accessor_class_to_integer; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_to_string.cc b/src/grib_accessor_class_to_string.cc index e0ff98b53..77ba4330d 100644 --- a/src/grib_accessor_class_to_string.cc +++ b/src/grib_accessor_class_to_string.cc @@ -122,12 +122,6 @@ static grib_accessor_class _grib_accessor_class_to_string = { grib_accessor_class* grib_accessor_class_to_string = &_grib_accessor_class_to_string; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_transient.cc b/src/grib_accessor_class_transient.cc index c84f83ffd..bc30b049a 100644 --- a/src/grib_accessor_class_transient.cc +++ b/src/grib_accessor_class_transient.cc @@ -97,10 +97,4 @@ static grib_accessor_class _grib_accessor_class_transient = { grib_accessor_class* grib_accessor_class_transient = &_grib_accessor_class_transient; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_transient_darray.cc b/src/grib_accessor_class_transient_darray.cc index b26a97406..feb0e89d9 100644 --- a/src/grib_accessor_class_transient_darray.cc +++ b/src/grib_accessor_class_transient_darray.cc @@ -110,12 +110,6 @@ static grib_accessor_class _grib_accessor_class_transient_darray = { grib_accessor_class* grib_accessor_class_transient_darray = &_grib_accessor_class_transient_darray; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long length, grib_arguments* args) diff --git a/src/grib_accessor_class_trim.cc b/src/grib_accessor_class_trim.cc index e41b44219..3bb37003d 100644 --- a/src/grib_accessor_class_trim.cc +++ b/src/grib_accessor_class_trim.cc @@ -104,12 +104,6 @@ static grib_accessor_class _grib_accessor_class_trim = { grib_accessor_class* grib_accessor_class_trim = &_grib_accessor_class_trim; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long l, grib_arguments* arg) diff --git a/src/grib_accessor_class_uint16.cc b/src/grib_accessor_class_uint16.cc index 6f309c636..cb982e730 100644 --- a/src/grib_accessor_class_uint16.cc +++ b/src/grib_accessor_class_uint16.cc @@ -96,12 +96,6 @@ static grib_accessor_class _grib_accessor_class_uint16 = { grib_accessor_class* grib_accessor_class_uint16 = &_grib_accessor_class_uint16; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_long(grib_accessor* a, long* val, size_t* len) diff --git a/src/grib_accessor_class_uint16_little_endian.cc b/src/grib_accessor_class_uint16_little_endian.cc index cc933dd3d..0cb1401e1 100644 --- a/src/grib_accessor_class_uint16_little_endian.cc +++ b/src/grib_accessor_class_uint16_little_endian.cc @@ -96,12 +96,6 @@ static grib_accessor_class _grib_accessor_class_uint16_little_endian = { grib_accessor_class* grib_accessor_class_uint16_little_endian = &_grib_accessor_class_uint16_little_endian; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_long(grib_accessor* a, long* val, size_t* len) diff --git a/src/grib_accessor_class_uint32.cc b/src/grib_accessor_class_uint32.cc index 74877feee..72952db63 100644 --- a/src/grib_accessor_class_uint32.cc +++ b/src/grib_accessor_class_uint32.cc @@ -98,12 +98,6 @@ static grib_accessor_class _grib_accessor_class_uint32 = { grib_accessor_class* grib_accessor_class_uint32 = &_grib_accessor_class_uint32; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_long(grib_accessor* a, long* val, size_t* len) diff --git a/src/grib_accessor_class_uint32_little_endian.cc b/src/grib_accessor_class_uint32_little_endian.cc index 059542e2c..c91c43344 100644 --- a/src/grib_accessor_class_uint32_little_endian.cc +++ b/src/grib_accessor_class_uint32_little_endian.cc @@ -98,12 +98,6 @@ static grib_accessor_class _grib_accessor_class_uint32_little_endian = { grib_accessor_class* grib_accessor_class_uint32_little_endian = &_grib_accessor_class_uint32_little_endian; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_long(grib_accessor* a, long* val, size_t* len) diff --git a/src/grib_accessor_class_uint64.cc b/src/grib_accessor_class_uint64.cc index 3e6e5aff0..a2b7c2267 100644 --- a/src/grib_accessor_class_uint64.cc +++ b/src/grib_accessor_class_uint64.cc @@ -98,12 +98,6 @@ static grib_accessor_class _grib_accessor_class_uint64 = { grib_accessor_class* grib_accessor_class_uint64 = &_grib_accessor_class_uint64; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_long(grib_accessor* a, long* val, size_t* len) diff --git a/src/grib_accessor_class_uint64_little_endian.cc b/src/grib_accessor_class_uint64_little_endian.cc index 3949a1940..42145b505 100644 --- a/src/grib_accessor_class_uint64_little_endian.cc +++ b/src/grib_accessor_class_uint64_little_endian.cc @@ -98,12 +98,6 @@ static grib_accessor_class _grib_accessor_class_uint64_little_endian = { grib_accessor_class* grib_accessor_class_uint64_little_endian = &_grib_accessor_class_uint64_little_endian; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_long(grib_accessor* a, long* val, size_t* len) diff --git a/src/grib_accessor_class_uint8.cc b/src/grib_accessor_class_uint8.cc index 446ee3335..7ee71cc32 100644 --- a/src/grib_accessor_class_uint8.cc +++ b/src/grib_accessor_class_uint8.cc @@ -98,12 +98,6 @@ static grib_accessor_class _grib_accessor_class_uint8 = { grib_accessor_class* grib_accessor_class_uint8 = &_grib_accessor_class_uint8; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static int unpack_long(grib_accessor* a, long* val, size_t* len) diff --git a/src/grib_accessor_class_unexpanded_descriptors.cc b/src/grib_accessor_class_unexpanded_descriptors.cc index e7a2ce856..0f8e107df 100644 --- a/src/grib_accessor_class_unexpanded_descriptors.cc +++ b/src/grib_accessor_class_unexpanded_descriptors.cc @@ -111,12 +111,6 @@ static grib_accessor_class _grib_accessor_class_unexpanded_descriptors = { grib_accessor_class* grib_accessor_class_unexpanded_descriptors = &_grib_accessor_class_unexpanded_descriptors; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* args) diff --git a/src/grib_accessor_class_unpack_bufr_values.cc b/src/grib_accessor_class_unpack_bufr_values.cc index 15e949ab8..1d7f468f8 100644 --- a/src/grib_accessor_class_unpack_bufr_values.cc +++ b/src/grib_accessor_class_unpack_bufr_values.cc @@ -110,12 +110,6 @@ static grib_accessor_class _grib_accessor_class_unpack_bufr_values = { grib_accessor_class* grib_accessor_class_unpack_bufr_values = &_grib_accessor_class_unpack_bufr_values; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* params) diff --git a/src/grib_accessor_class_unsigned.cc b/src/grib_accessor_class_unsigned.cc index f620fc590..1d3114156 100644 --- a/src/grib_accessor_class_unsigned.cc +++ b/src/grib_accessor_class_unsigned.cc @@ -114,12 +114,6 @@ static grib_accessor_class _grib_accessor_class_unsigned = { grib_accessor_class* grib_accessor_class_unsigned = &_grib_accessor_class_unsigned; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_accessor_class_unsigned_bits.cc b/src/grib_accessor_class_unsigned_bits.cc index 9425058c0..2833153df 100644 --- a/src/grib_accessor_class_unsigned_bits.cc +++ b/src/grib_accessor_class_unsigned_bits.cc @@ -113,12 +113,6 @@ static grib_accessor_class _grib_accessor_class_unsigned_bits = { grib_accessor_class* grib_accessor_class_unsigned_bits = &_grib_accessor_class_unsigned_bits; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ diff --git a/src/grib_accessor_class_validity_date.cc b/src/grib_accessor_class_validity_date.cc index 881478c0e..203f61b2d 100644 --- a/src/grib_accessor_class_validity_date.cc +++ b/src/grib_accessor_class_validity_date.cc @@ -112,12 +112,6 @@ static grib_accessor_class _grib_accessor_class_validity_date = { grib_accessor_class* grib_accessor_class_validity_date = &_grib_accessor_class_validity_date; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ /* Table of multipliers to convert step units to minutes */ diff --git a/src/grib_accessor_class_validity_time.cc b/src/grib_accessor_class_validity_time.cc index 051518e69..33aed48d2 100644 --- a/src/grib_accessor_class_validity_time.cc +++ b/src/grib_accessor_class_validity_time.cc @@ -110,12 +110,6 @@ static grib_accessor_class _grib_accessor_class_validity_time = { grib_accessor_class* grib_accessor_class_validity_time = &_grib_accessor_class_validity_time; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ /* Table of multipliers to convert step units to minutes */ diff --git a/src/grib_accessor_class_values.cc b/src/grib_accessor_class_values.cc index 9d4a03c10..1715ef288 100644 --- a/src/grib_accessor_class_values.cc +++ b/src/grib_accessor_class_values.cc @@ -120,12 +120,6 @@ static grib_accessor_class _grib_accessor_class_values = { grib_accessor_class* grib_accessor_class_values = &_grib_accessor_class_values; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static long init_length(grib_accessor* a) { diff --git a/src/grib_accessor_class_variable.cc b/src/grib_accessor_class_variable.cc index b03a06c30..f52e1d51f 100644 --- a/src/grib_accessor_class_variable.cc +++ b/src/grib_accessor_class_variable.cc @@ -120,12 +120,6 @@ static grib_accessor_class _grib_accessor_class_variable = { grib_accessor_class* grib_accessor_class_variable = &_grib_accessor_class_variable; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ #define MAX_VARIABLE_STRING_LENGTH 255 diff --git a/src/grib_accessor_class_vector.cc b/src/grib_accessor_class_vector.cc index e4c885268..feae78ea9 100644 --- a/src/grib_accessor_class_vector.cc +++ b/src/grib_accessor_class_vector.cc @@ -108,12 +108,6 @@ static grib_accessor_class _grib_accessor_class_vector = { grib_accessor_class* grib_accessor_class_vector = &_grib_accessor_class_vector; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ typedef struct grib_accessor_abstract_vector diff --git a/src/grib_accessor_class_when.cc b/src/grib_accessor_class_when.cc index f13833310..e46881759 100644 --- a/src/grib_accessor_class_when.cc +++ b/src/grib_accessor_class_when.cc @@ -101,12 +101,6 @@ static grib_accessor_class _grib_accessor_class_when = { grib_accessor_class* grib_accessor_class_when = &_grib_accessor_class_when; - -//static void init_class(grib_accessor_class* c) -//{ -// INIT -//} - /* END_CLASS_IMP */ static void init(grib_accessor* a, const long len, grib_arguments* arg) diff --git a/src/grib_api_internal.h b/src/grib_api_internal.h index 94fd5e815..9f413495b 100644 --- a/src/grib_api_internal.h +++ b/src/grib_api_internal.h @@ -1252,7 +1252,6 @@ struct grib_int_array int* el; }; -#if 1 struct grib_fieldset { grib_context* context; @@ -1267,7 +1266,6 @@ struct grib_fieldset long current; grib_field** fields; }; -#endif /* concept index structures */ diff --git a/src/grib_context.cc b/src/grib_context.cc index b2983b49f..90b531f6f 100644 --- a/src/grib_context.cc +++ b/src/grib_context.cc @@ -1069,17 +1069,15 @@ void grib_context_log(const grib_context* c, int level, const char* fmt, ...) level = level & ~GRIB_LOG_PERROR; /* #if HAS_STRERROR */ -#if 1 strcat(msg, " ("); strcat(msg, strerror(errsv)); strcat(msg, ")"); -#else - if (errsv > 0 && errsv < sys_nerr) { - strcat(msg, " ("); - strcat(msg, sys_errlist[errsv]); - strcat(msg, " )"); - } -#endif + + // if (errsv > 0 && errsv < sys_nerr) { + // strcat(msg, " ("); + // strcat(msg, sys_errlist[errsv]); + // strcat(msg, " )"); + // } } if (c->output_log) diff --git a/src/grib_date.cc b/src/grib_date.cc index cd2fc32cf..b069cb8b6 100644 --- a/src/grib_date.cc +++ b/src/grib_date.cc @@ -45,21 +45,19 @@ int grib_julian_to_datetime(double jd, long* year, long* month, long* day, *day = (long)dday; dday -= *day; -#if 1 /* ANF-CG 02.03.2012 */ s = ROUND((double)(dday * 86400)); /* total in sec , no msec*/ *hour = (long)s / 3600; *minute = (long)((s % 3600) / 60); *second = (long)(s % 60); -#else - /* Old algorithm, now replaced by above. See GRIB-180 */ - dhour = dday * 24; - *hour = (long)dhour; - dhour -= *hour; - dminute = dhour * 60; - *minute = (long)dminute; - *second = (long)((dminute - *minute) * 60); -#endif + + // Old algorithm, now replaced by above. See GRIB-180 + // dhour = dday * 24; + // *hour = (long)dhour; + // dhour -= *hour; + // dminute = dhour * 60; + // *minute = (long)dminute; + // *second = (long)((dminute - *minute) * 60); if (e < 14) *month = e - 1; diff --git a/src/grib_dumper_class_debug.cc b/src/grib_dumper_class_debug.cc index 75a6c858c..79c1ea29c 100644 --- a/src/grib_dumper_class_debug.cc +++ b/src/grib_dumper_class_debug.cc @@ -453,7 +453,6 @@ static void dump_values(grib_dumper* d, grib_accessor* a) k = 0; while (k < size) { -#if 1 int j; for (i = 0; i < d->depth + 3; i++) fprintf(self->dumper.out, " "); @@ -463,11 +462,6 @@ static void dump_values(grib_dumper* d, grib_accessor* a) fprintf(self->dumper.out, ", "); } fprintf(self->dumper.out, "\n"); -#else - - fprintf(self->dumper.out, "%d %g\n", k, buf[k]); - -#endif } if (more) { for (i = 0; i < d->depth + 3; i++) @@ -497,12 +491,11 @@ static void dump_section(grib_dumper* d, grib_accessor* a, grib_block_of_accesso /* grib_section* s = grib_get_sub_section(a); */ grib_section* s = a->sub_section; -#if 1 if (a->name[0] == '_') { grib_dump_accessors_block(d, block); return; } -#endif + for (i = 0; i < d->depth; i++) fprintf(self->dumper.out, " "); fprintf(self->dumper.out, "======> %s %s (%ld,%ld,%ld)\n", a->creator->op, diff --git a/src/grib_dumper_class_default.cc b/src/grib_dumper_class_default.cc index b3c87eb7e..61aface7f 100644 --- a/src/grib_dumper_class_default.cc +++ b/src/grib_dumper_class_default.cc @@ -611,7 +611,6 @@ static void dump_values(grib_dumper* d, grib_accessor* a) k = 0; while (k < size) { -#if 1 int j; fprintf(self->dumper.out, " "); for (j = 0; j < 5 && k < size; j++, k++) { @@ -620,11 +619,6 @@ static void dump_values(grib_dumper* d, grib_accessor* a) fprintf(self->dumper.out, ", "); } fprintf(self->dumper.out, "\n"); -#else - - fprintf(self->dumper.out, "%d %g\n", k, buf[k]); - -#endif } if (more) { fprintf(self->dumper.out, " "); diff --git a/src/grib_dumper_class_grib_encode_C.cc b/src/grib_dumper_class_grib_encode_C.cc index e6af382db..91d07b688 100644 --- a/src/grib_dumper_class_grib_encode_C.cc +++ b/src/grib_dumper_class_grib_encode_C.cc @@ -135,10 +135,8 @@ static void dump_long(grib_dumper* d, grib_accessor* a, const char* comment) if ((a->flags & GRIB_ACCESSOR_FLAG_READ_ONLY)) return; -#if 1 if (comment) pcomment(self->dumper.out, value, comment); -#endif if (((a->flags & GRIB_ACCESSOR_FLAG_CAN_BE_MISSING) != 0) && (value == GRIB_MISSING_LONG)) fprintf(self->dumper.out, " GRIB_CHECK(grib_set_missing(h,\"%s\"),%d);\n", a->name, 0); @@ -231,10 +229,8 @@ static void dump_string(grib_dumper* d, grib_accessor* a, const char* comment) if (a->length == 0) return; -#if 1 if (comment) fprintf(self->dumper.out, "/* %s */\n", comment); -#endif fprintf(self->dumper.out, " p = \"%s\";\n", value); fprintf(self->dumper.out, " size = strlen(p);\n"); diff --git a/src/grib_dumper_class_wmo.cc b/src/grib_dumper_class_wmo.cc index 6d84a0b28..7c898543a 100644 --- a/src/grib_dumper_class_wmo.cc +++ b/src/grib_dumper_class_wmo.cc @@ -486,7 +486,6 @@ static void dump_values(grib_dumper* d, grib_accessor* a) k = 0; while (k < size) { -#if 1 int j; /*for(i = 0; i < d->depth + 3 ; i++) fprintf(self->dumper.out," ");*/ for (j = 0; j < 8 && k < size; j++, k++) { @@ -498,14 +497,10 @@ static void dump_values(grib_dumper* d, grib_accessor* a) fprintf(self->dumper.out, ", "); } fprintf(self->dumper.out, "\n"); -#else - - if (is_char) - fprintf(self->dumper.out, "%d '%c'\n", k, (char)buf[k]); - else - fprintf(self->dumper.out, "%d %g\n", k, buf[k]); - -#endif + // if (is_char) + // fprintf(self->dumper.out, "%d '%c'\n", k, (char)buf[k]); + // else + // fprintf(self->dumper.out, "%d %g\n", k, buf[k]); } if (more) { /*for(i = 0; i < d->depth + 3 ; i++) fprintf(self->dumper.out," ");*/ diff --git a/src/grib_expression_class_accessor.cc b/src/grib_expression_class_accessor.cc index f6ea5f1a4..e806a3e1a 100644 --- a/src/grib_expression_class_accessor.cc +++ b/src/grib_expression_class_accessor.cc @@ -68,20 +68,18 @@ typedef struct grib_expression_accessor{ static grib_expression_class _grib_expression_class_accessor = { 0, /* super */ "accessor", /* name */ - sizeof(grib_expression_accessor),/* size of instance */ + sizeof(grib_expression_accessor),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - &get_name, - - &evaluate_long, - &evaluate_double, - &evaluate_string, + &native_type, + &get_name, + &evaluate_long, + &evaluate_double, + &evaluate_string, }; grib_expression_class* grib_expression_class_accessor = &_grib_expression_class_accessor; diff --git a/src/grib_expression_class_binop.cc b/src/grib_expression_class_binop.cc index 8d4770f46..e95bebbd3 100644 --- a/src/grib_expression_class_binop.cc +++ b/src/grib_expression_class_binop.cc @@ -68,20 +68,18 @@ typedef struct grib_expression_binop{ static grib_expression_class _grib_expression_class_binop = { 0, /* super */ "binop", /* name */ - sizeof(grib_expression_binop),/* size of instance */ + sizeof(grib_expression_binop),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - 0, - - &evaluate_long, - &evaluate_double, - 0, + &native_type, + 0, + &evaluate_long, + &evaluate_double, + 0, }; grib_expression_class* grib_expression_class_binop = &_grib_expression_class_binop; diff --git a/src/grib_expression_class_column.cc b/src/grib_expression_class_column.cc index 6f92b8b25..b683b93a5 100644 --- a/src/grib_expression_class_column.cc +++ b/src/grib_expression_class_column.cc @@ -65,20 +65,18 @@ typedef struct grib_expression_column{ static grib_expression_class _grib_expression_class_column = { 0, /* super */ "column", /* name */ - sizeof(grib_expression_column),/* size of instance */ + sizeof(grib_expression_column),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ 0, 0, - - &native_type, - &get_name, - - &evaluate_long, - &evaluate_double, - &evaluate_string, + &native_type, + &get_name, + &evaluate_long, + &evaluate_double, + &evaluate_string, }; grib_expression_class* grib_expression_class_column = &_grib_expression_class_column; diff --git a/src/grib_expression_class_constant.cc b/src/grib_expression_class_constant.cc index 24fa871a4..7bd817678 100644 --- a/src/grib_expression_class_constant.cc +++ b/src/grib_expression_class_constant.cc @@ -61,20 +61,18 @@ typedef struct grib_expression_constant{ static grib_expression_class _grib_expression_class_constant = { 0, /* super */ "constant", /* name */ - sizeof(grib_expression_constant),/* size of instance */ + sizeof(grib_expression_constant),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - 0, - - 0, - 0, - 0, + &native_type, + 0, + 0, + 0, + 0, }; grib_expression_class* grib_expression_class_constant = &_grib_expression_class_constant; diff --git a/src/grib_expression_class_double.cc b/src/grib_expression_class_double.cc index b123dc1c3..f904c887e 100644 --- a/src/grib_expression_class_double.cc +++ b/src/grib_expression_class_double.cc @@ -60,20 +60,18 @@ typedef struct grib_expression_double{ static grib_expression_class _grib_expression_class_double = { 0, /* super */ "double", /* name */ - sizeof(grib_expression_double),/* size of instance */ + sizeof(grib_expression_double),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - 0, - - &evaluate_long, - &evaluate_double, - 0, + &native_type, + 0, + &evaluate_long, + &evaluate_double, + 0, }; grib_expression_class* grib_expression_class_double = &_grib_expression_class_double; diff --git a/src/grib_expression_class_functor.cc b/src/grib_expression_class_functor.cc index 5c9d9c3ca..99ab0ad36 100644 --- a/src/grib_expression_class_functor.cc +++ b/src/grib_expression_class_functor.cc @@ -60,20 +60,18 @@ typedef struct grib_expression_functor{ static grib_expression_class _grib_expression_class_functor = { 0, /* super */ "functor", /* name */ - sizeof(grib_expression_functor),/* size of instance */ + sizeof(grib_expression_functor),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - 0, - - &evaluate_long, - 0, - 0, + &native_type, + 0, + &evaluate_long, + 0, + 0, }; grib_expression_class* grib_expression_class_functor = &_grib_expression_class_functor; diff --git a/src/grib_expression_class_is_in_dict.cc b/src/grib_expression_class_is_in_dict.cc index d28759d95..6cb43acb3 100644 --- a/src/grib_expression_class_is_in_dict.cc +++ b/src/grib_expression_class_is_in_dict.cc @@ -64,20 +64,18 @@ typedef struct grib_expression_is_in_dict{ static grib_expression_class _grib_expression_class_is_in_dict = { 0, /* super */ "is_in_dict", /* name */ - sizeof(grib_expression_is_in_dict),/* size of instance */ + sizeof(grib_expression_is_in_dict),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ 0, /* destructor */ &print, &add_dependency, - - &native_type, - &get_name, - - &evaluate_long, - &evaluate_double, - &evaluate_string, + &native_type, + &get_name, + &evaluate_long, + &evaluate_double, + &evaluate_string, }; grib_expression_class* grib_expression_class_is_in_dict = &_grib_expression_class_is_in_dict; diff --git a/src/grib_expression_class_is_in_list.cc b/src/grib_expression_class_is_in_list.cc index 24ebb57f8..4a6c3dc3b 100644 --- a/src/grib_expression_class_is_in_list.cc +++ b/src/grib_expression_class_is_in_list.cc @@ -66,20 +66,18 @@ typedef struct grib_expression_is_in_list{ static grib_expression_class _grib_expression_class_is_in_list = { 0, /* super */ "is_in_list", /* name */ - sizeof(grib_expression_is_in_list),/* size of instance */ + sizeof(grib_expression_is_in_list),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - &get_name, - - &evaluate_long, - &evaluate_double, - &evaluate_string, + &native_type, + &get_name, + &evaluate_long, + &evaluate_double, + &evaluate_string, }; grib_expression_class* grib_expression_class_is_in_list = &_grib_expression_class_is_in_list; diff --git a/src/grib_expression_class_is_integer.cc b/src/grib_expression_class_is_integer.cc index f170f6d44..c42ae9f86 100644 --- a/src/grib_expression_class_is_integer.cc +++ b/src/grib_expression_class_is_integer.cc @@ -68,20 +68,18 @@ typedef struct grib_expression_is_integer{ static grib_expression_class _grib_expression_class_is_integer = { 0, /* super */ "is_integer", /* name */ - sizeof(grib_expression_is_integer),/* size of instance */ + sizeof(grib_expression_is_integer),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - &get_name, - - &evaluate_long, - &evaluate_double, - &evaluate_string, + &native_type, + &get_name, + &evaluate_long, + &evaluate_double, + &evaluate_string, }; grib_expression_class* grib_expression_class_is_integer = &_grib_expression_class_is_integer; diff --git a/src/grib_expression_class_length.cc b/src/grib_expression_class_length.cc index e64d3c0eb..c685f2186 100644 --- a/src/grib_expression_class_length.cc +++ b/src/grib_expression_class_length.cc @@ -68,20 +68,18 @@ typedef struct grib_expression_length{ static grib_expression_class _grib_expression_class_length = { 0, /* super */ "length", /* name */ - sizeof(grib_expression_length),/* size of instance */ + sizeof(grib_expression_length),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - &get_name, - - &evaluate_long, - &evaluate_double, - &evaluate_string, + &native_type, + &get_name, + &evaluate_long, + &evaluate_double, + &evaluate_string, }; grib_expression_class* grib_expression_class_length = &_grib_expression_class_length; diff --git a/src/grib_expression_class_logical_and.cc b/src/grib_expression_class_logical_and.cc index ee03656d2..5cf98db69 100644 --- a/src/grib_expression_class_logical_and.cc +++ b/src/grib_expression_class_logical_and.cc @@ -63,20 +63,18 @@ typedef struct grib_expression_logical_and{ static grib_expression_class _grib_expression_class_logical_and = { 0, /* super */ "logical_and", /* name */ - sizeof(grib_expression_logical_and),/* size of instance */ + sizeof(grib_expression_logical_and),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - 0, - - &evaluate_long, - &evaluate_double, - 0, + &native_type, + 0, + &evaluate_long, + &evaluate_double, + 0, }; grib_expression_class* grib_expression_class_logical_and = &_grib_expression_class_logical_and; diff --git a/src/grib_expression_class_logical_or.cc b/src/grib_expression_class_logical_or.cc index e83100d3b..75c2a6520 100644 --- a/src/grib_expression_class_logical_or.cc +++ b/src/grib_expression_class_logical_or.cc @@ -63,20 +63,18 @@ typedef struct grib_expression_logical_or{ static grib_expression_class _grib_expression_class_logical_or = { 0, /* super */ "logical_or", /* name */ - sizeof(grib_expression_logical_or),/* size of instance */ + sizeof(grib_expression_logical_or),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - 0, - - &evaluate_long, - &evaluate_double, - 0, + &native_type, + 0, + &evaluate_long, + &evaluate_double, + 0, }; grib_expression_class* grib_expression_class_logical_or = &_grib_expression_class_logical_or; diff --git a/src/grib_expression_class_long.cc b/src/grib_expression_class_long.cc index 9e5fd585a..481e143c8 100644 --- a/src/grib_expression_class_long.cc +++ b/src/grib_expression_class_long.cc @@ -60,20 +60,18 @@ typedef struct grib_expression_long{ static grib_expression_class _grib_expression_class_long = { 0, /* super */ "long", /* name */ - sizeof(grib_expression_long),/* size of instance */ + sizeof(grib_expression_long),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - 0, - - &evaluate_long, - &evaluate_double, - 0, + &native_type, + 0, + &evaluate_long, + &evaluate_double, + 0, }; grib_expression_class* grib_expression_class_long = &_grib_expression_class_long; diff --git a/src/grib_expression_class_string.cc b/src/grib_expression_class_string.cc index f36d23dbe..1d6734c4c 100644 --- a/src/grib_expression_class_string.cc +++ b/src/grib_expression_class_string.cc @@ -58,20 +58,18 @@ typedef struct grib_expression_string{ static grib_expression_class _grib_expression_class_string = { 0, /* super */ "string", /* name */ - sizeof(grib_expression_string),/* size of instance */ + sizeof(grib_expression_string),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - 0, - - 0, - 0, - &evaluate_string, + &native_type, + 0, + 0, + 0, + &evaluate_string, }; grib_expression_class* grib_expression_class_string = &_grib_expression_class_string; diff --git a/src/grib_expression_class_string_compare.cc b/src/grib_expression_class_string_compare.cc index 1686ca0ba..8ee196c2e 100644 --- a/src/grib_expression_class_string_compare.cc +++ b/src/grib_expression_class_string_compare.cc @@ -62,20 +62,18 @@ typedef struct grib_expression_string_compare{ static grib_expression_class _grib_expression_class_string_compare = { 0, /* super */ "string_compare", /* name */ - sizeof(grib_expression_string_compare),/* size of instance */ + sizeof(grib_expression_string_compare),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - 0, - - &evaluate_long, - &evaluate_double, - 0, + &native_type, + 0, + &evaluate_long, + &evaluate_double, + 0, }; grib_expression_class* grib_expression_class_string_compare = &_grib_expression_class_string_compare; diff --git a/src/grib_expression_class_sub_string.cc b/src/grib_expression_class_sub_string.cc index 3d7fa5507..0a53638bc 100644 --- a/src/grib_expression_class_sub_string.cc +++ b/src/grib_expression_class_sub_string.cc @@ -58,20 +58,18 @@ typedef struct grib_expression_sub_string{ static grib_expression_class _grib_expression_class_sub_string = { 0, /* super */ "sub_string", /* name */ - sizeof(grib_expression_sub_string),/* size of instance */ + sizeof(grib_expression_sub_string),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - 0, - - 0, - 0, - &evaluate_string, + &native_type, + 0, + 0, + 0, + &evaluate_string, }; grib_expression_class* grib_expression_class_sub_string = &_grib_expression_class_sub_string; diff --git a/src/grib_expression_class_true.cc b/src/grib_expression_class_true.cc index ec702322a..a57ce9c60 100644 --- a/src/grib_expression_class_true.cc +++ b/src/grib_expression_class_true.cc @@ -58,20 +58,18 @@ typedef struct grib_expression_true{ static grib_expression_class _grib_expression_class_true = { 0, /* super */ "true", /* name */ - sizeof(grib_expression_true),/* size of instance */ + sizeof(grib_expression_true),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - 0, - - &evaluate_long, - &evaluate_double, - 0, + &native_type, + 0, + &evaluate_long, + &evaluate_double, + 0, }; grib_expression_class* grib_expression_class_true = &_grib_expression_class_true; diff --git a/src/grib_expression_class_unop.cc b/src/grib_expression_class_unop.cc index 619cb3564..2abd4dbc9 100644 --- a/src/grib_expression_class_unop.cc +++ b/src/grib_expression_class_unop.cc @@ -64,20 +64,18 @@ typedef struct grib_expression_unop{ static grib_expression_class _grib_expression_class_unop = { 0, /* super */ "unop", /* name */ - sizeof(grib_expression_unop),/* size of instance */ + sizeof(grib_expression_unop),/* size of instance */ 0, /* inited */ &init_class, /* init_class */ 0, /* constructor */ &destroy, /* destructor */ &print, &add_dependency, - - &native_type, - 0, - - &evaluate_long, - &evaluate_double, - 0, + &native_type, + 0, + &evaluate_long, + &evaluate_double, + 0, }; grib_expression_class* grib_expression_class_unop = &_grib_expression_class_unop; diff --git a/src/grib_loader_from_handle.cc b/src/grib_loader_from_handle.cc index ccda34362..e47f9fa92 100644 --- a/src/grib_loader_from_handle.cc +++ b/src/grib_loader_from_handle.cc @@ -51,13 +51,9 @@ int grib_lookup_long_from_handle(grib_context* gc, grib_loader* loader, const ch if (b) return grib_unpack_long(b, value, &len); - /* TODO: fix me. For now, we don't fail on a lookup. */ -#if 1 + /* TODO: fix me. For now, we don't fail on a lookup. */ *value = -1; return GRIB_SUCCESS; -#else - return GRIB_NOT_FOUND; -#endif } int grib_init_accessor_from_handle(grib_loader* loader, grib_accessor* ga, grib_arguments* default_value) diff --git a/src/md5.cc b/src/md5.cc index 1d04a291b..3231be905 100644 --- a/src/md5.cc +++ b/src/md5.cc @@ -67,7 +67,6 @@ static const unsigned long k[] = { static void grib_md5_flush(grib_md5_state* s) { -#if 1 unsigned long a = s->h0; unsigned long b = s->h1; unsigned long c = s->h2; @@ -154,60 +153,6 @@ static void grib_md5_flush(grib_md5_state* s) I_(c, d, a, b, 2, 62); I_(b, c, d, a, 9, 63); -#else - unsigned long i, g; - unsigned long a = s->h0; - unsigned long b = s->h1; - unsigned long c = s->h2; - unsigned long d = s->h3; - unsigned long f; - unsigned long temp; - unsigned long* w = &s->words[0]; - unsigned long h; - for (i = 0; i < 16; i++) { - f = F(b, c, d); - g = i; - temp = d; - d = c; - c = b; - h = a + f + k[i] + w[g]; - b = b + rotate(h, r[i]); - a = temp; - } - - for (i = 16; i < 32; i++) { - f = G(b, c, d); - g = (5 * i + 1) % 16; - temp = d; - d = c; - c = b; - h = a + f + k[i] + w[g]; - b = b + rotate(h, r[i]); - a = temp; - } - for (i = 32; i < 48; i++) { - f = H(b, c, d); - g = (3 * i + 5) % 16; - temp = d; - d = c; - c = b; - h = a + f + k[i] + w[g]; - b = b + rotate(h, r[i]); - a = temp; - } - for (i = 48; i < 64; i++) { - f = I(b, c, d); - g = (7 * i) % 16; - temp = d; - d = c; - c = b; - h = a + f + k[i] + w[g]; - b = b + rotate(h, r[i]); - a = temp; - } - -#endif - s->h0 += a; s->h1 += b; s->h2 += c; diff --git a/tools/metar_compare.cc b/tools/metar_compare.cc index e83535e72..097efd61c 100644 --- a/tools/metar_compare.cc +++ b/tools/metar_compare.cc @@ -20,7 +20,6 @@ grib_option grib_options[] = { { "S:", "start", "First field to be processed.\n", 0, 1, 0 }, { "E:", "end", "Last field to be processed.\n", 0, 1, 0 }, { "a", 0, "-c option modifier. The keys listed with the option -c will be added to the list of keys compared without -c.\n", 0, 1, 0 }, - { "H", 0, "Compare only message headers. Bit-by-bit compare on. Incompatible with -c option.\n", 0, 1, 0 }, { "R:", 0, 0, 0, 1, 0 }, { "A:", 0, 0, 0, 1, 0 }, { "P", 0, "Compare data values using the packing error as tolerance.\n", 0, 1, 0 }, @@ -85,7 +84,6 @@ static int lastPrint = 0; static int force = 0; static double maxAbsoluteError = 1e-19; static int onlyListed = 1; -static int headerMode = 0; static int morein1 = 0; static int morein2 = 0; static int listFromCommandLine; @@ -231,11 +229,6 @@ int grib_tool_init(grib_runtime_options* options) else onlyListed = 1; - if (grib_options_on("H")) - headerMode = 1; - else - headerMode = 0; - if (grib_options_on("H") && grib_options_on("c:")) { printf("Error: -H and -c options are incompatible. Choose one of the two please.\n"); exit(1); @@ -1033,8 +1026,8 @@ static int compare_handles(grib_handle* h1, grib_handle* h2, grib_runtime_option grib_keys_iterator* iter = NULL; const char* name = NULL; - /* mask only if no -c option or headerMode (-H)*/ - if (blocklist && (!listFromCommandLine || headerMode)) { + /* mask only if no -c option (-H)*/ + if (blocklist && !listFromCommandLine) { grib_string_list* nextb = blocklist; while (nextb) { grib_clear(h1, nextb->value); @@ -1043,45 +1036,6 @@ static int compare_handles(grib_handle* h1, grib_handle* h2, grib_runtime_option } } - if (headerMode) { - const void *msg1 = NULL, *msg2 = NULL; - size_t size1 = 0, size2 = 0; - grib_handle *h11, *h22; - GRIB_CHECK_NOLINE(grib_get_message_headers(h1, &msg1, &size1), 0); - GRIB_CHECK_NOLINE(grib_get_message_headers(h2, &msg2, &size2), 0); - if (size1 == size2 && !memcmp(msg1, msg2, size1)) - return 0; - - err = 0; - h11 = grib_handle_new_from_partial_message(h1->context, msg1, size1); - h22 = grib_handle_new_from_partial_message(h1->context, msg2, size2); - - iter = grib_keys_iterator_new(h11, - GRIB_KEYS_ITERATOR_SKIP_COMPUTED, NULL); - - if (!iter) { - printf("ERROR: unable to get iterator\n"); - exit(1); - } - - while (grib_keys_iterator_next(iter)) { - name = grib_keys_iterator_get_name(iter); - /*printf("----- comparing %s\n",name);*/ - - if (blocklisted(name)) - continue; - if (compare_values(options, h11, h22, name, GRIB_TYPE_UNDEFINED)) { - err++; - write_messages(h11, h22); - } - } - - grib_keys_iterator_delete(iter); - grib_handle_delete(h11); - grib_handle_delete(h22); - return err; - } - if (listFromCommandLine && onlyListed) { for (i = 0; i < options->compare_count; i++) { if (blocklisted((char*)options->compare[i].name))