Cosmetics

src/accessor/grib_accessor_class_position.cc

@@ -11,29 +11,33 @@
 
 #include "grib_accessor_class_position.h"
 
-grib_accessor_class_position_t _grib_accessor_class_position{"position"};
+grib_accessor_class_position_t _grib_accessor_class_position{ "position" };
 grib_accessor_class* grib_accessor_class_position = &_grib_accessor_class_position;
 
 
-void grib_accessor_class_position_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+void grib_accessor_class_position_t::init(grib_accessor* a, const long len, grib_arguments* arg)
+{
  grib_accessor_class_gen_t::init(a, len, arg);
  a->length = 0;
  a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
  a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
  a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
 }
 
-int grib_accessor_class_position_t::get_native_type(grib_accessor* a){
+int grib_accessor_class_position_t::get_native_type(grib_accessor* a)
+{
  return GRIB_TYPE_LONG;
 }
 
-void grib_accessor_class_position_t::dump(grib_accessor* a, grib_dumper* dumper){
+void grib_accessor_class_position_t::dump(grib_accessor* a, grib_dumper* dumper)
+{
  grib_dump_long(dumper, a, NULL);
 }
 
-int grib_accessor_class_position_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+int grib_accessor_class_position_t::unpack_long(grib_accessor* a, long* val, size_t* len)
+{
  if (*len < 1) {
- grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %d values ", a->name, 1);
+ grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s, it contains %d values ", a->name, 1);
  *len = 0;
  return GRIB_ARRAY_TOO_SMALL;
  }

src/accessor/grib_accessor_class_proj_string.cc

@@ -11,14 +11,15 @@
 
 #include "grib_accessor_class_proj_string.h"
 
-grib_accessor_class_proj_string_t _grib_accessor_class_proj_string{"proj_string"};
+grib_accessor_class_proj_string_t _grib_accessor_class_proj_string{ "proj_string" };
 grib_accessor_class* grib_accessor_class_proj_string = &_grib_accessor_class_proj_string;
 
 
-void grib_accessor_class_proj_string_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+void grib_accessor_class_proj_string_t::init(grib_accessor* a, const long len, grib_arguments* arg)
+{
  grib_accessor_class_gen_t::init(a, len, arg);
  grib_accessor_proj_string_t* self = (grib_accessor_proj_string_t*)a;
- grib_handle* h = grib_handle_of_accessor(a);
+ grib_handle* h  = grib_handle_of_accessor(a);
 
  self->grid_type = grib_arguments_get_name(h, arg, 0);
  self->endpoint = grib_arguments_get_long(h, arg, 1);
@@ -27,21 +28,23 @@ void grib_accessor_class_proj_string_t::init(grib_accessor* a, const long len, g
  a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
 }
 
-int grib_accessor_class_proj_string_t::get_native_type(grib_accessor* a){
+int grib_accessor_class_proj_string_t::get_native_type(grib_accessor* a)
+{
  return GRIB_TYPE_STRING;
 }
 
 // Function pointer than takes a handle and returns the proj string
 typedef int (*proj_func)(grib_handle*, char*);
 struct proj_mapping
 {
- const char* gridType; // key gridType
- proj_func func; // function to compute proj string
+ const char* gridType;  // key gridType
+ proj_func func;  // function to compute proj string
 };
 typedef struct proj_mapping proj_mapping;
 
 // This should only be called for GRID POINT data (not spherical harmonics etc)
-static int get_major_minor_axes(grib_handle* h, double* pMajor, double* pMinor){
+static int get_major_minor_axes(grib_handle* h, double* pMajor, double* pMinor)
+{
  int err = 0;
  if (grib_is_earth_oblate(h)) {
  if ((err = grib_get_double_internal(h, "earthMinorAxisInMetres", pMinor)) != GRIB_SUCCESS) return err;
@@ -56,19 +59,21 @@ static int get_major_minor_axes(grib_handle* h, double* pMajor, double* pMinor){
 }
 
 // Caller must have allocated enough space in the 'result' argument
-static int get_earth_shape(grib_handle* h, char* result){
+static int get_earth_shape(grib_handle* h, char* result)
+{
  int err = 0;
  double major = 0, minor = 0;
  if ((err = get_major_minor_axes(h, &major, &minor)) != GRIB_SUCCESS)
  return err;
  if (major == minor)
- snprintf(result, 128, "+R=%lf", major); // spherical
+ snprintf(result, 128, "+R=%lf", major);  // spherical
  else
- snprintf(result, 128, "+a=%lf +b=%lf", major, minor); // oblate
+ snprintf(result, 128, "+a=%lf +b=%lf", major, minor);  // oblate
  return err;
 }
 
-static int proj_space_view(grib_handle* h, char* result){
+static int proj_space_view(grib_handle* h, char* result)
+{
  return GRIB_NOT_IMPLEMENTED;
  // int err = 0;
  // char shape[128] = {0,};
@@ -84,18 +89,22 @@ static int proj_space_view(grib_handle* h, char* result){
  // return err;
 }
 
-static int proj_albers(grib_handle* h, char* result){
+static int proj_albers(grib_handle* h, char* result)
+{
  return GRIB_NOT_IMPLEMENTED;
 }
-static int proj_transverse_mercator(grib_handle* h, char* result){
+static int proj_transverse_mercator(grib_handle* h, char* result)
+{
  return GRIB_NOT_IMPLEMENTED;
 }
-static int proj_equatorial_azimuthal_equidistant(grib_handle* h, char* result){
+static int proj_equatorial_azimuthal_equidistant(grib_handle* h, char* result)
+{
  return GRIB_NOT_IMPLEMENTED;
 }
 
-static int proj_lambert_conformal(grib_handle* h, char* result){
- int err = 0;
+static int proj_lambert_conformal(grib_handle* h, char* result)
+{
+ int err = 0;
  char shape[128] = {0,};
  double LoVInDegrees = 0, LaDInDegrees = 0, Latin1InDegrees = 0, Latin2InDegrees = 0;
 
@@ -110,12 +119,13 @@ static int proj_lambert_conformal(grib_handle* h, char* result){
  if ((err = grib_get_double_internal(h, "LaDInDegrees", &LaDInDegrees)) != GRIB_SUCCESS)
  return err;
  snprintf(result, 1024, "+proj=lcc +lon_0=%lf +lat_0=%lf +lat_1=%lf +lat_2=%lf %s",
- LoVInDegrees, LaDInDegrees, Latin1InDegrees, Latin2InDegrees, shape);
+  LoVInDegrees, LaDInDegrees, Latin1InDegrees, Latin2InDegrees, shape);
  return err;
 }
 
-static int proj_lambert_azimuthal_equal_area(grib_handle* h, char* result){
- int err = 0;
+static int proj_lambert_azimuthal_equal_area(grib_handle* h, char* result)
+{
+ int err = 0;
  char shape[128] = {0,};
  double standardParallel = 0, centralLongitude = 0;
 
@@ -126,11 +136,12 @@ static int proj_lambert_azimuthal_equal_area(grib_handle* h, char* result){
  if ((err = grib_get_double_internal(h, "centralLongitudeInDegrees", &centralLongitude)) != GRIB_SUCCESS)
  return err;
  snprintf(result, 1024, "+proj=laea +lon_0=%lf +lat_0=%lf %s",
- centralLongitude, standardParallel, shape);
+  centralLongitude, standardParallel, shape);
  return err;
 }
 
-static int proj_polar_stereographic(grib_handle* h, char* result){
+static int proj_polar_stereographic(grib_handle* h, char* result)
+{
  int err = 0;
  double centralLongitude = 0, centralLatitude = 0;
  int has_northPole = 0;
@@ -147,33 +158,35 @@ static int proj_polar_stereographic(grib_handle* h, char* result){
  return err;
  has_northPole = ((projectionCentreFlag & 128) == 0);
  snprintf(result, 1024, "+proj=stere +lat_ts=%lf +lat_0=%s +lon_0=%lf +k_0=1 +x_0=0 +y_0=0 %s",
- centralLatitude, has_northPole ? "90" : "-90", centralLongitude, shape);
+  centralLatitude, has_northPole ? "90" : "-90", centralLongitude, shape);
  return err;
 }
 
 // ECC-1552: This is for regular_ll, regular_gg, reduced_ll, reduced_gg
 // These are not 'projected' grids!
-static int proj_unprojected(grib_handle* h, char* result){
+static int proj_unprojected(grib_handle* h, char* result)
+{
  int err = 0;
- //char shape[128] = {0,};
- //if ((err = get_earth_shape(h, shape)) != GRIB_SUCCESS) return err;
- //snprintf(result, 1024, "+proj=longlat %s", shape);
+ // char shape[128] = {0,};
+ // if ((err = get_earth_shape(h, shape)) != GRIB_SUCCESS) return err;
+ // snprintf(result, 1024, "+proj=longlat %s", shape);
  snprintf(result, 1024, "+proj=longlat +datum=WGS84 +no_defs +type=crs");
 
  return err;
 }
 
-static int proj_mercator(grib_handle* h, char* result){
+static int proj_mercator(grib_handle* h, char* result)
+{
  int err = 0;
  double LaDInDegrees = 0;
- char shape[128]  = {0,};
+ char shape[128] = {0,};
 
  if ((err = grib_get_double_internal(h, "LaDInDegrees", &LaDInDegrees)) != GRIB_SUCCESS)
  return err;
  if ((err = get_earth_shape(h, shape)) != GRIB_SUCCESS)
  return err;
  snprintf(result, 1024, "+proj=merc +lat_ts=%lf +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 %s",
- LaDInDegrees, shape);
+  LaDInDegrees, shape);
  return err;
 }
 
@@ -195,17 +208,18 @@ static proj_mapping proj_mappings[] = {
 
 #define ENDPOINT_SOURCE 0
 #define ENDPOINT_TARGET 1
-int grib_accessor_class_proj_string_t::unpack_string(grib_accessor* a, char* v, size_t* len){
+int grib_accessor_class_proj_string_t::unpack_string(grib_accessor* a, char* v, size_t* len)
+{
  grib_accessor_proj_string_t* self = (grib_accessor_proj_string_t*)a;
  int err = 0, found = 0;
- size_t i = 0;
+ size_t i  = 0;
  char grid_type[64] = {0,};
  grib_handle* h = grib_handle_of_accessor(a);
- size_t size = sizeof(grid_type) / sizeof(*grid_type);
+ size_t size  = sizeof(grid_type) / sizeof(*grid_type);
 
  Assert(self->endpoint == ENDPOINT_SOURCE || self->endpoint == ENDPOINT_TARGET);
 
- size_t l = 100; // Safe bet
+ size_t l = 100;  // Safe bet
  if (*len < l) {
  const char* cclass_name = a->cclass->name;
  grib_context_log(a->context, GRIB_LOG_ERROR,

src/accessor/grib_accessor_class_raw.cc

@@ -11,11 +11,12 @@
 
 #include "grib_accessor_class_raw.h"
 
-grib_accessor_class_raw_t _grib_accessor_class_raw{"raw"};
+grib_accessor_class_raw_t _grib_accessor_class_raw{ "raw" };
 grib_accessor_class* grib_accessor_class_raw = &_grib_accessor_class_raw;
 
 
-void grib_accessor_class_raw_t::init(grib_accessor* a, const long len, grib_arguments* arg){
+void grib_accessor_class_raw_t::init(grib_accessor* a, const long len, grib_arguments* arg)
+{
  grib_accessor_class_gen_t::init(a, len, arg);
  int n = 0;
  int err = 0;
@@ -42,31 +43,37 @@ void grib_accessor_class_raw_t::init(grib_accessor* a, const long len, grib_argu
  /* Assert(a->length>=0); */
 }
 
-int grib_accessor_class_raw_t::get_native_type(grib_accessor* a){
+int grib_accessor_class_raw_t::get_native_type(grib_accessor* a)
+{
  return GRIB_TYPE_BYTES;
 }
 
 
-int grib_accessor_class_raw_t::compare(grib_accessor* a, grib_accessor* b){
+int grib_accessor_class_raw_t::compare(grib_accessor* a, grib_accessor* b)
+{
  int retval = GRIB_SUCCESS;
 
- size_t alen = (size_t)a->byte_count(); size_t blen = (size_t)b->byte_count();
+ size_t alen = (size_t)a->byte_count();
+ size_t blen = (size_t)b->byte_count();
  if (alen != blen)
  return GRIB_COUNT_MISMATCH;
 
  return retval;
 }
 
-long grib_accessor_class_raw_t::byte_count(grib_accessor* a){
+long grib_accessor_class_raw_t::byte_count(grib_accessor* a)
+{
  return a->length;
 }
 
-int grib_accessor_class_raw_t::value_count(grib_accessor* a, long* len){
+int grib_accessor_class_raw_t::value_count(grib_accessor* a, long* len)
+{
  *len = a->length;
  return 0;
 }
 
-int grib_accessor_class_raw_t::unpack_bytes(grib_accessor* a, unsigned char* buffer, size_t* len){
+int grib_accessor_class_raw_t::unpack_bytes(grib_accessor* a, unsigned char* buffer, size_t* len)
+{
  if (*len < a->length) {
  *len = a->length;
  return GRIB_ARRAY_TOO_SMALL;
@@ -78,7 +85,8 @@ int grib_accessor_class_raw_t::unpack_bytes(grib_accessor* a, unsigned char* buf
  return GRIB_SUCCESS;
 }
 
-void grib_accessor_class_raw_t::update_size(grib_accessor* a, size_t s){
+void grib_accessor_class_raw_t::update_size(grib_accessor* a, size_t s)
+{
  grib_context_log(a->context, GRIB_LOG_DEBUG, "updating size of %s old %ld new %ld", a->name, a->length, s);
  a->length = s;
  Assert(a->length >= 0);
@@ -94,13 +102,14 @@ long accessor_raw_get_offset(grib_accessor* a)
  return a->offset;
 }
 
-int grib_accessor_class_raw_t::pack_bytes(grib_accessor* a, const unsigned char* val, size_t* len){
+int grib_accessor_class_raw_t::pack_bytes(grib_accessor* a, const unsigned char* val, size_t* len)
+{
  size_t length = *len;
  long totalLength;
  long sectionLength;
- grib_handle* h = grib_handle_of_accessor(a);
+ grib_handle* h  = grib_handle_of_accessor(a);
  grib_accessor_raw_t* self = (grib_accessor_raw_t*)a;
- long dlen = length - a->length;
+ long dlen  = length - a->length;
 
  grib_get_long(h, self->totalLength, &totalLength);
  totalLength += dlen;

src/accessor/grib_accessor_class_rdbtime_guess_date.cc

@@ -15,10 +15,11 @@ grib_accessor_class_rdbtime_guess_date_t _grib_accessor_class_rdbtime_guess_date
 grib_accessor_class* grib_accessor_class_rdbtime_guess_date = &_grib_accessor_class_rdbtime_guess_date;
 
 
-void grib_accessor_class_rdbtime_guess_date_t::init(grib_accessor* a, const long l, grib_arguments* c){
+void grib_accessor_class_rdbtime_guess_date_t::init(grib_accessor* a, const long l, grib_arguments* c)
+{
  grib_accessor_class_long_t::init(a, l, c);
  grib_accessor_rdbtime_guess_date_t* self = (grib_accessor_rdbtime_guess_date_t*)a;
- int n  = 0;
+ int n = 0;
 
  self->typicalYear = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
  self->typicalMonth = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
@@ -29,14 +30,14 @@ void grib_accessor_class_rdbtime_guess_date_t::init(grib_accessor* a, const long
  /* a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY; */
 }
 
-int grib_accessor_class_rdbtime_guess_date_t::unpack_long(grib_accessor* a, long* val, size_t* len){
+int grib_accessor_class_rdbtime_guess_date_t::unpack_long(grib_accessor* a, long* val, size_t* len)
+{
  grib_accessor_rdbtime_guess_date_t* self = (grib_accessor_rdbtime_guess_date_t*)a;
- grib_handle* h = grib_handle_of_accessor(a);
- int ret = 0;
+ grib_handle* h = grib_handle_of_accessor(a);
  long typicalYear, typicalMonth, typicalDay, rdbDay;
  long rdbYear, rdbMonth;
 
- ret = grib_get_long(h, self->typicalYear, &typicalYear);
+ int ret = grib_get_long(h, self->typicalYear, &typicalYear);
  if (ret)
  return ret;
  ret = grib_get_long(h, self->typicalMonth, &typicalMonth);
@@ -70,7 +71,8 @@ int grib_accessor_class_rdbtime_guess_date_t::unpack_long(grib_accessor* a, long
  return GRIB_SUCCESS;
 }
 
-int grib_accessor_class_rdbtime_guess_date_t::pack_long(grib_accessor* a, const long* v, size_t* len){
+int grib_accessor_class_rdbtime_guess_date_t::pack_long(grib_accessor* a, const long* v, size_t* len)
+{
  /* do nothing*/
  return GRIB_SUCCESS;
 }