mirror of https://github.com/ecmwf/eccodes.git
C++ warnings
This commit is contained in:
Shahram Najm
parent
12959de080
commit
8abeb45135
|
|
@ -164,7 +164,7 @@ static parameter* find_parameter(const request* r, const char* parname)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static void _reqmerge(parameter* pa, const parameter* pb, request* a)
|
||||
static void ecc_reqmerge(parameter* pa, const parameter* pb, request* a)
|
||||
{
|
||||
const value* vb = pb->values;
|
||||
|
||||
|
|
@ -201,7 +201,7 @@ static void _reqmerge(parameter* pa, const parameter* pb, request* a)
|
|||
}
|
||||
|
||||
/* Fast version if a && b same */
|
||||
static boolean _reqmerge1(request* a, const request* b)
|
||||
static boolean ecc_reqmerge1(request* a, const request* b)
|
||||
{
|
||||
parameter* pa = a->params;
|
||||
const parameter* pb = b->params;
|
||||
|
|
@ -210,7 +210,7 @@ static boolean _reqmerge1(request* a, const request* b)
|
|||
if (strcmp(pa->name, pb->name) != 0)
|
||||
return FALSE;
|
||||
|
||||
_reqmerge(pa, pb, a);
|
||||
ecc_reqmerge(pa, pb, a);
|
||||
|
||||
pa = pa->next;
|
||||
pb = pb->next;
|
||||
|
|
@ -396,7 +396,7 @@ static void add_value(request* r, const char* parname, const char* fmt, ...)
|
|||
put_value(r, parname, buffer, TRUE, FALSE, FALSE);
|
||||
}
|
||||
|
||||
static void _reqmerge2(request* a, const request* b)
|
||||
static void ecc_reqmerge2(request* a, const request* b)
|
||||
{
|
||||
const parameter* pb = b->params;
|
||||
|
||||
|
|
@ -411,7 +411,7 @@ static void _reqmerge2(request* a, const request* b)
|
|||
}
|
||||
}
|
||||
else {
|
||||
_reqmerge(pa, pb, a);
|
||||
ecc_reqmerge(pa, pb, a);
|
||||
}
|
||||
|
||||
pb = pb->next;
|
||||
|
|
@ -421,8 +421,8 @@ static void _reqmerge2(request* a, const request* b)
|
|||
static void reqmerge(request* a, const request* b)
|
||||
{
|
||||
if (a && b) {
|
||||
if (!_reqmerge1(a, b))
|
||||
_reqmerge2(a, b);
|
||||
if (!ecc_reqmerge1(a, b))
|
||||
ecc_reqmerge2(a, b);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -719,7 +719,7 @@ static const char* get_axis(const hypercube* h, int pos);
|
|||
static const char* get_axis(const hypercube* h, int pos);
|
||||
static int cube_order(const hypercube* h, const request* r);
|
||||
static void free_hypercube(hypercube* h);
|
||||
static int _cube_position(const hypercube* h, const request* r, boolean remove_holes);
|
||||
static int ecc_cube_position(const hypercube* h, const request* r, boolean remove_holes);
|
||||
|
||||
static value* clone_one_value(const value* p)
|
||||
{
|
||||
|
|
@ -1532,12 +1532,12 @@ static int count_hypercube(const request* r)
|
|||
|
||||
static int cube_order(const hypercube* h, const request* r)
|
||||
{
|
||||
return _cube_position(h, r, TRUE);
|
||||
return ecc_cube_position(h, r, TRUE);
|
||||
}
|
||||
|
||||
static int cube_position(const hypercube* h, const request* r)
|
||||
{
|
||||
return _cube_position(h, r, FALSE);
|
||||
return ecc_cube_position(h, r, FALSE);
|
||||
}
|
||||
|
||||
static void reserve_index_cache(hypercube* h, int size)
|
||||
|
|
@ -1553,7 +1553,7 @@ static void reserve_index_cache(hypercube* h, int size)
|
|||
h->index_cache_size = size;
|
||||
}
|
||||
|
||||
static int _cube_position(const hypercube* h, const request* r, boolean remove_holes)
|
||||
static int ecc_cube_position(const hypercube* h, const request* r, boolean remove_holes)
|
||||
{
|
||||
request* cube = h->cube;
|
||||
int c = count_axis(h);
|
||||
|
|
@ -1585,7 +1585,7 @@ static int _cube_position(const hypercube* h, const request* r, boolean remove_h
|
|||
break;
|
||||
}
|
||||
else
|
||||
grib_context_log(ctx, GRIB_LOG_DEBUG, "grib_to_netcdf: _cube_position, %s, %s != %s [%scompare function available]", axis, w, v, h->compare ? "" : "no ");
|
||||
grib_context_log(ctx, GRIB_LOG_DEBUG, "grib_to_netcdf: ecc_cube_position, %s, %s != %s [%scompare function available]", axis, w, v, h->compare ? "" : "no ");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1959,7 +1959,7 @@ static long monthnumber(const char* m)
|
|||
return -1;
|
||||
}
|
||||
|
||||
int check_stepUnits(const char* step_units_str)
|
||||
static int check_stepUnits(const char* step_units_str)
|
||||
{
|
||||
/* Only hours, minutes and seconds supported */
|
||||
if (strcmp(step_units_str, "h") == 0 ||
|
||||
|
|
@ -2019,7 +2019,7 @@ static void validation_time(request* r)
|
|||
if (is_number(p))
|
||||
date = atol(p);
|
||||
else {
|
||||
long julian = 0, second = 0;
|
||||
long second = 0;
|
||||
boolean isjul, date_ok;
|
||||
date_ok = parsedate(p, &julian, &second, &isjul);
|
||||
if (!date_ok)
|
||||
|
|
@ -3145,7 +3145,7 @@ static int define_netcdf_dimensions(hypercube* h, fieldset* fs, int ncid, datase
|
|||
}
|
||||
|
||||
/* Dimension-less variable for MARS request */
|
||||
if (0) /* reset when we have proper & fast mars_description */
|
||||
if ((0)) /* reset when we have proper & fast mars_description */
|
||||
{
|
||||
/* parameter *p = data_r->params; */
|
||||
parameter* p = setup.mars_description->params;
|
||||
|
|
@ -3758,7 +3758,7 @@ static boolean parsedate(const char* name, long* julian, long* second, boolean*
|
|||
if (isalpha(*p)) {
|
||||
char month[32];
|
||||
int day = 0;
|
||||
int n = sscanf(p, "%[^-]-%d", month, &day);
|
||||
n = sscanf(p, "%[^-]-%d", month, &day);
|
||||
/* Matched two items (month and day) and month is 3 letters */
|
||||
if (n == 2 && strlen(month) == 3) {
|
||||
y = 1900; /* no year specified */
|
||||
|
|
|
|||
Loading…
Reference in New Issue