From 1f8206a1111b11cd7390db1351940df9c0d914de Mon Sep 17 00:00:00 2001 From: shahramn Date: Fri, 30 Aug 2024 15:27:35 +0100 Subject: [PATCH] Compiler warnings --- src/action.class | 21 +++++++++------------ src/action_class_alias.cc | 21 +++++++++------------ src/action_class_assert.cc | 21 +++++++++------------ src/action_class_close.cc | 21 +++++++++------------ src/action_class_concept.cc | 21 +++++++++------------ src/action_class_gen.cc | 21 +++++++++------------ src/action_class_hash_array.cc | 21 +++++++++------------ src/action_class_if.cc | 21 +++++++++------------ src/action_class_list.cc | 21 +++++++++------------ src/action_class_meta.cc | 21 +++++++++------------ src/action_class_modify.cc | 21 +++++++++------------ src/action_class_noop.cc | 21 +++++++++------------ src/action_class_print.cc | 21 +++++++++------------ src/action_class_remove.cc | 21 +++++++++------------ src/action_class_rename.cc | 21 +++++++++------------ src/action_class_section.cc | 21 +++++++++------------ src/action_class_set.cc | 21 +++++++++------------ src/action_class_set_darray.cc | 21 +++++++++------------ src/action_class_set_missing.cc | 21 +++++++++------------ src/action_class_set_sarray.cc | 21 +++++++++------------ src/action_class_switch.cc | 21 +++++++++------------ src/action_class_template.cc | 21 +++++++++------------ src/action_class_transient_darray.cc | 21 +++++++++------------ src/action_class_variable.cc | 21 +++++++++------------ src/action_class_when.cc | 21 +++++++++------------ src/action_class_write.cc | 21 +++++++++------------ src/expression.class | 12 ++++++------ src/grib_accessor_class.cc | 2 +- src/grib_context.cc | 11 +++++------ src/grib_expression_class_accessor.cc | 12 ++++++------ src/grib_expression_class_binop.cc | 12 ++++++------ src/grib_expression_class_double.cc | 12 ++++++------ src/grib_expression_class_functor.cc | 12 ++++++------ src/grib_expression_class_is_in_dict.cc | 12 ++++++------ src/grib_expression_class_is_in_list.cc | 12 ++++++------ src/grib_expression_class_is_integer.cc | 12 ++++++------ src/grib_expression_class_length.cc | 12 ++++++------ src/grib_expression_class_logical_and.cc | 12 ++++++------ src/grib_expression_class_logical_or.cc | 12 ++++++------ src/grib_expression_class_long.cc | 12 ++++++------ src/grib_expression_class_string.cc | 12 ++++++------ src/grib_expression_class_string_compare.cc | 12 ++++++------ src/grib_expression_class_sub_string.cc | 12 ++++++------ src/grib_expression_class_true.cc | 12 ++++++------ src/grib_expression_class_unop.cc | 12 ++++++------ 45 files changed, 342 insertions(+), 421 deletions(-) diff --git a/src/action.class b/src/action.class index 772c328c6..704079e07 100644 --- a/src/action.class +++ b/src/action.class @@ -17,20 +17,17 @@ MEMBERS extern grib_action_class* SUPER; static grib_action_class _grib_action_class_NAME = { - &SUPER, /* super */ - "action_class_NAME", /* name */ - sizeof(grib_action_NAME), /* size */ - 0, /* inited */ + &SUPER, /* super */ + "action_class_NAME", /* name */ + sizeof(grib_action_NAME), /* size */ + 0, /* inited */ &init_class, /* init_class */ - &init, /* init */ + &init, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - &xref, /* xref */ - - &create_accessor, /* create_accessor*/ - - ¬ify_change, /* notify_change */ + &dump, /* dump */ + &xref, /* xref */ + &create_accessor, /* create_accessor */ + ¬ify_change, /* notify_change */ &reparse, /* reparse */ &execute, /* execute */ }; diff --git a/src/action_class_alias.cc b/src/action_class_alias.cc index bcc2f799c..1659bc38c 100644 --- a/src/action_class_alias.cc +++ b/src/action_class_alias.cc @@ -49,20 +49,17 @@ typedef struct grib_action_alias { static grib_action_class _grib_action_class_alias = { - 0, /* super */ - "action_class_alias", /* name */ - sizeof(grib_action_alias), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_alias", /* name */ + sizeof(grib_action_alias), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - &create_accessor, /* create_accessor*/ - - 0, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + &create_accessor, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ 0, /* execute */ }; diff --git a/src/action_class_assert.cc b/src/action_class_assert.cc index b19330505..bc449c7ab 100644 --- a/src/action_class_assert.cc +++ b/src/action_class_assert.cc @@ -49,20 +49,17 @@ typedef struct grib_action_assert { static grib_action_class _grib_action_class_assert = { - 0, /* super */ - "action_class_assert", /* name */ - sizeof(grib_action_assert), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_assert", /* name */ + sizeof(grib_action_assert), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - &create_accessor, /* create_accessor*/ - - ¬ify_change, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + &create_accessor, /* create_accessor */ + ¬ify_change, /* notify_change */ 0, /* reparse */ &execute, /* execute */ }; diff --git a/src/action_class_close.cc b/src/action_class_close.cc index dfe635890..00108c607 100644 --- a/src/action_class_close.cc +++ b/src/action_class_close.cc @@ -43,20 +43,17 @@ typedef struct grib_action_close { static grib_action_class _grib_action_class_close = { - 0, /* super */ - "action_class_close", /* name */ - sizeof(grib_action_close), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_close", /* name */ + sizeof(grib_action_close), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - 0, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - 0, /* notify_change */ + 0, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ &execute, /* execute */ }; diff --git a/src/action_class_concept.cc b/src/action_class_concept.cc index fa639c54c..9799632ce 100644 --- a/src/action_class_concept.cc +++ b/src/action_class_concept.cc @@ -60,20 +60,17 @@ typedef struct grib_action_concept { extern grib_action_class* grib_action_class_gen; static grib_action_class _grib_action_class_concept = { - &grib_action_class_gen, /* super */ - "action_class_concept", /* name */ - sizeof(grib_action_concept), /* size */ - 0, /* inited */ + &grib_action_class_gen, /* super */ + "action_class_concept", /* name */ + sizeof(grib_action_concept), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - 0, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ 0, /* execute */ }; diff --git a/src/action_class_gen.cc b/src/action_class_gen.cc index 722391c7f..d4b7e11a8 100644 --- a/src/action_class_gen.cc +++ b/src/action_class_gen.cc @@ -54,20 +54,17 @@ typedef struct grib_action_gen { static grib_action_class _grib_action_class_gen = { - 0, /* super */ - "action_class_gen", /* name */ - sizeof(grib_action_gen), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_gen", /* name */ + sizeof(grib_action_gen), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - &create_accessor, /* create_accessor*/ - - ¬ify_change, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + &create_accessor, /* create_accessor */ + ¬ify_change, /* notify_change */ 0, /* reparse */ 0, /* execute */ }; diff --git a/src/action_class_hash_array.cc b/src/action_class_hash_array.cc index 9a61f9e56..55e87ddda 100644 --- a/src/action_class_hash_array.cc +++ b/src/action_class_hash_array.cc @@ -61,20 +61,17 @@ typedef struct grib_action_hash_array { extern grib_action_class* grib_action_class_gen; static grib_action_class _grib_action_class_hash_array = { - &grib_action_class_gen, /* super */ - "action_class_hash_array", /* name */ - sizeof(grib_action_hash_array), /* size */ - 0, /* inited */ + &grib_action_class_gen, /* super */ + "action_class_hash_array", /* name */ + sizeof(grib_action_hash_array), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - 0, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ 0, /* execute */ }; diff --git a/src/action_class_if.cc b/src/action_class_if.cc index 8a07b901b..3fd8b1ec9 100644 --- a/src/action_class_if.cc +++ b/src/action_class_if.cc @@ -61,20 +61,17 @@ typedef struct grib_action_if { extern grib_action_class* grib_action_class_section; static grib_action_class _grib_action_class_if = { - &grib_action_class_section, /* super */ - "action_class_if", /* name */ - sizeof(grib_action_if), /* size */ - 0, /* inited */ + &grib_action_class_section, /* super */ + "action_class_if", /* name */ + sizeof(grib_action_if), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - &create_accessor, /* create_accessor*/ - - 0, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + &create_accessor, /* create_accessor */ + 0, /* notify_change */ &reparse, /* reparse */ &execute, /* execute */ }; diff --git a/src/action_class_list.cc b/src/action_class_list.cc index 163a6da55..1475487ee 100644 --- a/src/action_class_list.cc +++ b/src/action_class_list.cc @@ -56,20 +56,17 @@ typedef struct grib_action_list { extern grib_action_class* grib_action_class_section; static grib_action_class _grib_action_class_list = { - &grib_action_class_section, /* super */ - "action_class_list", /* name */ - sizeof(grib_action_list), /* size */ - 0, /* inited */ + &grib_action_class_section, /* super */ + "action_class_list", /* name */ + sizeof(grib_action_list), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - &create_accessor, /* create_accessor*/ - - 0, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + &create_accessor, /* create_accessor */ + 0, /* notify_change */ &reparse, /* reparse */ 0, /* execute */ }; diff --git a/src/action_class_meta.cc b/src/action_class_meta.cc index 3b5c375eb..7164593e7 100644 --- a/src/action_class_meta.cc +++ b/src/action_class_meta.cc @@ -51,20 +51,17 @@ typedef struct grib_action_meta { extern grib_action_class* grib_action_class_gen; static grib_action_class _grib_action_class_meta = { - &grib_action_class_gen, /* super */ - "action_class_meta", /* name */ - sizeof(grib_action_meta), /* size */ - 0, /* inited */ + &grib_action_class_gen, /* super */ + "action_class_meta", /* name */ + sizeof(grib_action_meta), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ 0, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - 0, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ &execute, /* execute */ }; diff --git a/src/action_class_modify.cc b/src/action_class_modify.cc index cc5795559..28ceed17e 100644 --- a/src/action_class_modify.cc +++ b/src/action_class_modify.cc @@ -49,20 +49,17 @@ typedef struct grib_action_modify { static grib_action_class _grib_action_class_modify = { - 0, /* super */ - "action_class_modify", /* name */ - sizeof(grib_action_modify), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_modify", /* name */ + sizeof(grib_action_modify), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - 0, /* dump */ - 0, /* xref */ - - &create_accessor, /* create_accessor*/ - - 0, /* notify_change */ + 0, /* dump */ + 0, /* xref */ + &create_accessor, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ 0, /* execute */ }; diff --git a/src/action_class_noop.cc b/src/action_class_noop.cc index aa5196a46..2b7c1ab62 100644 --- a/src/action_class_noop.cc +++ b/src/action_class_noop.cc @@ -44,20 +44,17 @@ typedef struct grib_action_noop { static grib_action_class _grib_action_class_noop = { - 0, /* super */ - "action_class_noop", /* name */ - sizeof(grib_action_noop), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_noop", /* name */ + sizeof(grib_action_noop), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - 0, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - 0, /* notify_change */ + 0, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ &execute, /* execute */ }; diff --git a/src/action_class_print.cc b/src/action_class_print.cc index 0286c636f..c96e6e22c 100644 --- a/src/action_class_print.cc +++ b/src/action_class_print.cc @@ -48,20 +48,17 @@ typedef struct grib_action_print { static grib_action_class _grib_action_class_print = { - 0, /* super */ - "action_class_print", /* name */ - sizeof(grib_action_print), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_print", /* name */ + sizeof(grib_action_print), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - 0, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - 0, /* notify_change */ + 0, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ &execute, /* execute */ }; diff --git a/src/action_class_remove.cc b/src/action_class_remove.cc index eff91cdce..c64d8ff50 100644 --- a/src/action_class_remove.cc +++ b/src/action_class_remove.cc @@ -49,20 +49,17 @@ typedef struct grib_action_remove { static grib_action_class _grib_action_class_remove = { - 0, /* super */ - "action_class_remove", /* name */ - sizeof(grib_action_remove), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_remove", /* name */ + sizeof(grib_action_remove), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - &create_accessor, /* create_accessor*/ - - 0, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + &create_accessor, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ 0, /* execute */ }; diff --git a/src/action_class_rename.cc b/src/action_class_rename.cc index 3fb65a704..49a734bd2 100644 --- a/src/action_class_rename.cc +++ b/src/action_class_rename.cc @@ -51,20 +51,17 @@ typedef struct grib_action_rename { static grib_action_class _grib_action_class_rename = { - 0, /* super */ - "action_class_rename", /* name */ - sizeof(grib_action_rename), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_rename", /* name */ + sizeof(grib_action_rename), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - &create_accessor, /* create_accessor*/ - - 0, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + &create_accessor, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ 0, /* execute */ }; diff --git a/src/action_class_section.cc b/src/action_class_section.cc index 9dda3dc30..0602bbfcf 100644 --- a/src/action_class_section.cc +++ b/src/action_class_section.cc @@ -44,20 +44,17 @@ typedef struct grib_action_section { static grib_action_class _grib_action_class_section = { - 0, /* super */ - "action_class_section", /* name */ - sizeof(grib_action_section), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_section", /* name */ + sizeof(grib_action_section), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ 0, /* destroy */ - - 0, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - ¬ify_change, /* notify_change */ + 0, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + ¬ify_change, /* notify_change */ 0, /* reparse */ 0, /* execute */ }; diff --git a/src/action_class_set.cc b/src/action_class_set.cc index fee2ca406..799bd6be1 100644 --- a/src/action_class_set.cc +++ b/src/action_class_set.cc @@ -49,20 +49,17 @@ typedef struct grib_action_set { static grib_action_class _grib_action_class_set = { - 0, /* super */ - "action_class_set", /* name */ - sizeof(grib_action_set), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_set", /* name */ + sizeof(grib_action_set), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - 0, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ &execute, /* execute */ }; diff --git a/src/action_class_set_darray.cc b/src/action_class_set_darray.cc index bbf36f1d6..33ab219f1 100644 --- a/src/action_class_set_darray.cc +++ b/src/action_class_set_darray.cc @@ -47,20 +47,17 @@ typedef struct grib_action_set_darray { static grib_action_class _grib_action_class_set_darray = { - 0, /* super */ - "action_class_set_darray", /* name */ - sizeof(grib_action_set_darray), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_set_darray", /* name */ + sizeof(grib_action_set_darray), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - 0, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ &execute, /* execute */ }; diff --git a/src/action_class_set_missing.cc b/src/action_class_set_missing.cc index 03bd4ffc3..0907c3760 100644 --- a/src/action_class_set_missing.cc +++ b/src/action_class_set_missing.cc @@ -45,20 +45,17 @@ typedef struct grib_action_set_missing { static grib_action_class _grib_action_class_set_missing = { - 0, /* super */ - "action_class_set_missing", /* name */ - sizeof(grib_action_set_missing), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_set_missing", /* name */ + sizeof(grib_action_set_missing), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - 0, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ &execute, /* execute */ }; diff --git a/src/action_class_set_sarray.cc b/src/action_class_set_sarray.cc index bc51c2475..50626a0a9 100644 --- a/src/action_class_set_sarray.cc +++ b/src/action_class_set_sarray.cc @@ -47,20 +47,17 @@ typedef struct grib_action_set_sarray { static grib_action_class _grib_action_class_set_sarray = { - 0, /* super */ - "action_class_set_sarray", /* name */ - sizeof(grib_action_set_sarray), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_set_sarray", /* name */ + sizeof(grib_action_set_sarray), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - 0, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ &execute, /* execute */ }; diff --git a/src/action_class_switch.cc b/src/action_class_switch.cc index fa58071ce..547149987 100644 --- a/src/action_class_switch.cc +++ b/src/action_class_switch.cc @@ -51,20 +51,17 @@ typedef struct grib_action_switch { extern grib_action_class* grib_action_class_section; static grib_action_class _grib_action_class_switch = { - &grib_action_class_section, /* super */ - "action_class_switch", /* name */ - sizeof(grib_action_switch), /* size */ - 0, /* inited */ + &grib_action_class_section, /* super */ + "action_class_switch", /* name */ + sizeof(grib_action_switch), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - 0, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - 0, /* notify_change */ + 0, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ &execute, /* execute */ }; diff --git a/src/action_class_template.cc b/src/action_class_template.cc index 79fd2aeaf..13a13c4fd 100644 --- a/src/action_class_template.cc +++ b/src/action_class_template.cc @@ -57,20 +57,17 @@ typedef struct grib_action_template { extern grib_action_class* grib_action_class_section; static grib_action_class _grib_action_class_template = { - &grib_action_class_section, /* super */ - "action_class_template", /* name */ - sizeof(grib_action_template), /* size */ - 0, /* inited */ + &grib_action_class_section, /* super */ + "action_class_template", /* name */ + sizeof(grib_action_template), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - &create_accessor, /* create_accessor*/ - - 0, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + &create_accessor, /* create_accessor */ + 0, /* notify_change */ &reparse, /* reparse */ 0, /* execute */ }; diff --git a/src/action_class_transient_darray.cc b/src/action_class_transient_darray.cc index 276dcf3fa..baf15300a 100644 --- a/src/action_class_transient_darray.cc +++ b/src/action_class_transient_darray.cc @@ -52,20 +52,17 @@ typedef struct grib_action_transient_darray { extern grib_action_class* grib_action_class_gen; static grib_action_class _grib_action_class_transient_darray = { - &grib_action_class_gen, /* super */ - "action_class_transient_darray", /* name */ - sizeof(grib_action_transient_darray), /* size */ - 0, /* inited */ + &grib_action_class_gen, /* super */ + "action_class_transient_darray", /* name */ + sizeof(grib_action_transient_darray), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - 0, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ &execute, /* execute */ }; diff --git a/src/action_class_variable.cc b/src/action_class_variable.cc index 5b7e636ac..1ad93390c 100644 --- a/src/action_class_variable.cc +++ b/src/action_class_variable.cc @@ -48,20 +48,17 @@ typedef struct grib_action_variable { extern grib_action_class* grib_action_class_gen; static grib_action_class _grib_action_class_variable = { - &grib_action_class_gen, /* super */ - "action_class_variable", /* name */ - sizeof(grib_action_variable), /* size */ - 0, /* inited */ + &grib_action_class_gen, /* super */ + "action_class_variable", /* name */ + sizeof(grib_action_variable), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ 0, /* destroy */ - - 0, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - 0, /* notify_change */ + 0, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ &execute, /* execute */ }; diff --git a/src/action_class_when.cc b/src/action_class_when.cc index 359890f73..946a41e57 100644 --- a/src/action_class_when.cc +++ b/src/action_class_when.cc @@ -53,20 +53,17 @@ typedef struct grib_action_when { static grib_action_class _grib_action_class_when = { - 0, /* super */ - "action_class_when", /* name */ - sizeof(grib_action_when), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_when", /* name */ + sizeof(grib_action_when), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - &dump, /* dump */ - 0, /* xref */ - - &create_accessor, /* create_accessor*/ - - ¬ify_change, /* notify_change */ + &dump, /* dump */ + 0, /* xref */ + &create_accessor, /* create_accessor */ + ¬ify_change, /* notify_change */ 0, /* reparse */ 0, /* execute */ }; diff --git a/src/action_class_write.cc b/src/action_class_write.cc index 190264e9c..01d5d8a54 100644 --- a/src/action_class_write.cc +++ b/src/action_class_write.cc @@ -47,20 +47,17 @@ typedef struct grib_action_write { static grib_action_class _grib_action_class_write = { - 0, /* super */ - "action_class_write", /* name */ - sizeof(grib_action_write), /* size */ - 0, /* inited */ + 0, /* super */ + "action_class_write", /* name */ + sizeof(grib_action_write), /* size */ + 0, /* inited */ &init_class, /* init_class */ - 0, /* init */ + 0, /* init */ &destroy, /* destroy */ - - 0, /* dump */ - 0, /* xref */ - - 0, /* create_accessor*/ - - 0, /* notify_change */ + 0, /* dump */ + 0, /* xref */ + 0, /* create_accessor */ + 0, /* notify_change */ 0, /* reparse */ &execute, /* execute */ }; diff --git a/src/expression.class b/src/expression.class index 64c9a2e70..0db380e7c 100644 --- a/src/expression.class +++ b/src/expression.class @@ -2,7 +2,7 @@ typedef const char* string; /* to keep make_class.pl happy */ static void init(grib_expression* e); static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static string get_name(grib_expression* e); static int native_type(grib_expression*,grib_handle*); @@ -18,12 +18,12 @@ typedef struct grib_expression_NAME{ extern grib_expression_class* SUPER; static grib_expression_class _grib_expression_class_NAME = { - &SUPER, /* super */ - "NAME", /* name */ - sizeof(grib_expression_NAME),/* size of instance */ + &SUPER, /* super */ + "NAME", /* name */ + sizeof(grib_expression_NAME),/* size of instance */ 0, /* inited */ - &init, /* constructor */ - &destroy, /* destructor */ + &init, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_accessor_class.cc b/src/grib_accessor_class.cc index de7f8dc47..8beb025a8 100644 --- a/src/grib_accessor_class.cc +++ b/src/grib_accessor_class.cc @@ -74,7 +74,7 @@ static struct table_entry table[] = { grib_section* grib_create_root_section(const grib_context* context, grib_handle* h) { - char* fpath = 0; + const char* fpath = 0; grib_section* s = (grib_section*)grib_context_malloc_clear(context, sizeof(grib_section)); GRIB_MUTEX_INIT_ONCE(&once, &init_mutex); diff --git a/src/grib_context.cc b/src/grib_context.cc index 98ffe39e2..133f3e456 100644 --- a/src/grib_context.cc +++ b/src/grib_context.cc @@ -661,20 +661,19 @@ static int init_definition_files_dir(grib_context* c) } else { /* Definitions path contains multiple directories */ - char* dir = NULL; - dir = strtok_r(path, ECC_PATH_DELIMITER_STR, &lasts); + const char* dir = strtok_r(path, ECC_PATH_DELIMITER_STR, &lasts); while (dir != NULL) { if (next) { next->next = (grib_string_list*)grib_context_malloc_clear_persistent(c, sizeof(grib_string_list)); - next = next->next; + next = next->next; } else { c->grib_definition_files_dir = (grib_string_list*)grib_context_malloc_clear_persistent(c, sizeof(grib_string_list)); - next = c->grib_definition_files_dir; + next = c->grib_definition_files_dir; } next->value = codes_resolve_path(c, dir); - dir = strtok_r(NULL, ECC_PATH_DELIMITER_STR, &lasts); + dir = strtok_r(NULL, ECC_PATH_DELIMITER_STR, &lasts); } } @@ -1233,7 +1232,7 @@ void codes_assertion_failed(const char* message, const char* file, int line) /* Default behaviour is to abort * unless user has supplied his own assertion routine */ if (assertion == NULL) { - grib_context* c = grib_context_get_default(); + const grib_context* c = grib_context_get_default(); fprintf(stderr, "ecCodes assertion failed: `%s' in %s:%d\n", message, file, line); if (!c->no_abort) { abort(); diff --git a/src/grib_expression_class_accessor.cc b/src/grib_expression_class_accessor.cc index ed3fcd9fe..71bc70526 100644 --- a/src/grib_expression_class_accessor.cc +++ b/src/grib_expression_class_accessor.cc @@ -42,7 +42,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*, FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static string get_name(grib_expression* e); static int native_type(grib_expression*,grib_handle*); @@ -60,12 +60,12 @@ typedef struct grib_expression_accessor{ static grib_expression_class _grib_expression_class_accessor = { - 0, /* super */ - "accessor", /* name */ - sizeof(grib_expression_accessor),/* size of instance */ + 0, /* super */ + "accessor", /* name */ + sizeof(grib_expression_accessor),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_binop.cc b/src/grib_expression_class_binop.cc index c9b603497..60547ec2f 100644 --- a/src/grib_expression_class_binop.cc +++ b/src/grib_expression_class_binop.cc @@ -42,7 +42,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*, FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static int native_type(grib_expression*,grib_handle*); static int evaluate_long(grib_expression*,grib_handle*,long*); @@ -60,12 +60,12 @@ typedef struct grib_expression_binop{ static grib_expression_class _grib_expression_class_binop = { - 0, /* super */ - "binop", /* name */ - sizeof(grib_expression_binop),/* size of instance */ + 0, /* super */ + "binop", /* name */ + sizeof(grib_expression_binop),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_double.cc b/src/grib_expression_class_double.cc index 52d40832f..14e38e973 100644 --- a/src/grib_expression_class_double.cc +++ b/src/grib_expression_class_double.cc @@ -38,7 +38,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*, FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static int native_type(grib_expression*,grib_handle*); static int evaluate_long(grib_expression*,grib_handle*,long*); @@ -52,12 +52,12 @@ typedef struct grib_expression_double{ static grib_expression_class _grib_expression_class_double = { - 0, /* super */ - "double", /* name */ - sizeof(grib_expression_double),/* size of instance */ + 0, /* super */ + "double", /* name */ + sizeof(grib_expression_double),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_functor.cc b/src/grib_expression_class_functor.cc index 0f1d80214..eb147d963 100644 --- a/src/grib_expression_class_functor.cc +++ b/src/grib_expression_class_functor.cc @@ -38,7 +38,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*,FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static int native_type(grib_expression*,grib_handle*); static int evaluate_long(grib_expression*,grib_handle*,long*); @@ -52,12 +52,12 @@ typedef struct grib_expression_functor{ static grib_expression_class _grib_expression_class_functor = { - 0, /* super */ - "functor", /* name */ - sizeof(grib_expression_functor),/* size of instance */ + 0, /* super */ + "functor", /* name */ + sizeof(grib_expression_functor),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_is_in_dict.cc b/src/grib_expression_class_is_in_dict.cc index 46e0833f6..8d86c24bf 100644 --- a/src/grib_expression_class_is_in_dict.cc +++ b/src/grib_expression_class_is_in_dict.cc @@ -39,7 +39,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ -static void print(grib_context*,grib_expression*,grib_handle*,FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static string get_name(grib_expression* e); static int native_type(grib_expression*,grib_handle*); @@ -56,12 +56,12 @@ 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 */ + 0, /* super */ + "is_in_dict", /* name */ + sizeof(grib_expression_is_in_dict),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - 0, /* destructor */ + 0, /* constructor */ + 0, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_is_in_list.cc b/src/grib_expression_class_is_in_list.cc index 3e5e3728d..953481ad0 100644 --- a/src/grib_expression_class_is_in_list.cc +++ b/src/grib_expression_class_is_in_list.cc @@ -41,7 +41,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*,FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static string get_name(grib_expression* e); static int native_type(grib_expression*,grib_handle*); @@ -58,12 +58,12 @@ 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 */ + 0, /* super */ + "is_in_list", /* name */ + sizeof(grib_expression_is_in_list),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_is_integer.cc b/src/grib_expression_class_is_integer.cc index bf203bc81..d88756974 100644 --- a/src/grib_expression_class_is_integer.cc +++ b/src/grib_expression_class_is_integer.cc @@ -42,7 +42,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*, FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static string get_name(grib_expression* e); static int native_type(grib_expression*,grib_handle*); @@ -60,12 +60,12 @@ 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 */ + 0, /* super */ + "is_integer", /* name */ + sizeof(grib_expression_is_integer),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_length.cc b/src/grib_expression_class_length.cc index c8c63f8e8..e2c0d3202 100644 --- a/src/grib_expression_class_length.cc +++ b/src/grib_expression_class_length.cc @@ -42,7 +42,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*,FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static string get_name(grib_expression* e); static int native_type(grib_expression*,grib_handle*); @@ -60,12 +60,12 @@ typedef struct grib_expression_length{ static grib_expression_class _grib_expression_class_length = { - 0, /* super */ - "length", /* name */ - sizeof(grib_expression_length),/* size of instance */ + 0, /* super */ + "length", /* name */ + sizeof(grib_expression_length),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_logical_and.cc b/src/grib_expression_class_logical_and.cc index d95de8d92..419383373 100644 --- a/src/grib_expression_class_logical_and.cc +++ b/src/grib_expression_class_logical_and.cc @@ -39,7 +39,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*, FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static int native_type(grib_expression*,grib_handle*); static int evaluate_long(grib_expression*,grib_handle*,long*); @@ -54,12 +54,12 @@ 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 */ + 0, /* super */ + "logical_and", /* name */ + sizeof(grib_expression_logical_and),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_logical_or.cc b/src/grib_expression_class_logical_or.cc index aed0618f3..88867f35f 100644 --- a/src/grib_expression_class_logical_or.cc +++ b/src/grib_expression_class_logical_or.cc @@ -39,7 +39,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*,FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static int native_type(grib_expression*,grib_handle*); static int evaluate_long(grib_expression*,grib_handle*,long*); @@ -54,12 +54,12 @@ 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 */ + 0, /* super */ + "logical_or", /* name */ + sizeof(grib_expression_logical_or),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_long.cc b/src/grib_expression_class_long.cc index 774f736e6..946e6456d 100644 --- a/src/grib_expression_class_long.cc +++ b/src/grib_expression_class_long.cc @@ -38,7 +38,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*,FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static int native_type(grib_expression*,grib_handle*); static int evaluate_long(grib_expression*,grib_handle*,long*); @@ -52,12 +52,12 @@ typedef struct grib_expression_long{ static grib_expression_class _grib_expression_class_long = { - 0, /* super */ - "long", /* name */ - sizeof(grib_expression_long),/* size of instance */ + 0, /* super */ + "long", /* name */ + sizeof(grib_expression_long),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_string.cc b/src/grib_expression_class_string.cc index 379140de7..a085ed69e 100644 --- a/src/grib_expression_class_string.cc +++ b/src/grib_expression_class_string.cc @@ -37,7 +37,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*,FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static int native_type(grib_expression*,grib_handle*); static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); @@ -50,12 +50,12 @@ typedef struct grib_expression_string{ static grib_expression_class _grib_expression_class_string = { - 0, /* super */ - "string", /* name */ - sizeof(grib_expression_string),/* size of instance */ + 0, /* super */ + "string", /* name */ + sizeof(grib_expression_string),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_string_compare.cc b/src/grib_expression_class_string_compare.cc index ac54cb6d2..603846b7b 100644 --- a/src/grib_expression_class_string_compare.cc +++ b/src/grib_expression_class_string_compare.cc @@ -40,7 +40,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*,FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static int native_type(grib_expression*,grib_handle*); static int evaluate_long(grib_expression*,grib_handle*,long*); @@ -56,12 +56,12 @@ 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 */ + 0, /* super */ + "string_compare", /* name */ + sizeof(grib_expression_string_compare),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_sub_string.cc b/src/grib_expression_class_sub_string.cc index dd44ec323..8ed6c3dff 100644 --- a/src/grib_expression_class_sub_string.cc +++ b/src/grib_expression_class_sub_string.cc @@ -37,7 +37,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*,FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static int native_type(grib_expression*,grib_handle*); static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*); @@ -50,12 +50,12 @@ 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 */ + 0, /* super */ + "sub_string", /* name */ + sizeof(grib_expression_sub_string),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_true.cc b/src/grib_expression_class_true.cc index c2cd5faf6..41f3a40ae 100644 --- a/src/grib_expression_class_true.cc +++ b/src/grib_expression_class_true.cc @@ -37,7 +37,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*,FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static int native_type(grib_expression*,grib_handle*); static int evaluate_long(grib_expression*,grib_handle*,long*); @@ -50,12 +50,12 @@ typedef struct grib_expression_true{ static grib_expression_class _grib_expression_class_true = { - 0, /* super */ - "true", /* name */ - sizeof(grib_expression_true),/* size of instance */ + 0, /* super */ + "true", /* name */ + sizeof(grib_expression_true),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type, diff --git a/src/grib_expression_class_unop.cc b/src/grib_expression_class_unop.cc index 0de77a02d..18eb073fb 100644 --- a/src/grib_expression_class_unop.cc +++ b/src/grib_expression_class_unop.cc @@ -41,7 +41,7 @@ or edit "expression.class" and rerun ./make_class.pl typedef const char* string; /* to keep make_class.pl happy */ static void destroy(grib_context*,grib_expression* e); -static void print(grib_context*,grib_expression*,grib_handle*,FILE*); +static void print(grib_context*, grib_expression*, grib_handle*, FILE*); static void add_dependency(grib_expression* e, grib_accessor* observer); static string get_name(grib_expression* e); static int native_type(grib_expression*,grib_handle*); @@ -58,12 +58,12 @@ typedef struct grib_expression_unop{ static grib_expression_class _grib_expression_class_unop = { - 0, /* super */ - "unop", /* name */ - sizeof(grib_expression_unop),/* size of instance */ + 0, /* super */ + "unop", /* name */ + sizeof(grib_expression_unop),/* size of instance */ 0, /* inited */ - 0, /* constructor */ - &destroy, /* destructor */ + 0, /* constructor */ + &destroy, /* destructor */ &print, &add_dependency, &native_type,