core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix broken build (Windows Visual Studio)

This commit is contained in:
Shahram Najm 2014-03-05 11:33:31 +00:00
parent cf7671debc
commit 0a6f3d8bfa
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/grib_options.c
View File

@ -220,8 +220,10 @@ int grib_process_runtime_options(grib_context* context,int argc,char** argv,grib
if (grib_options_on("X:")) if (grib_options_on("X:"))
options->infile_offset=atol(grib_options_get_option("X:")); options->infile_offset=atol(grib_options_get_option("X:"));
#ifndef GRIB_ON_WINDOWS
/* Check at compile time to ensure our file offset is at least 64 bits */ /* Check at compile time to ensure our file offset is at least 64 bits */
COMPILE_TIME_ASSERT( sizeof(options->infile_offset) >= 8 ); COMPILE_TIME_ASSERT( sizeof(options->infile_offset) >= 8 );
#endif
has_output=grib_options_on("U"); has_output=grib_options_on("U");
has_input_extra=grib_options_on("I"); has_input_extra=grib_options_on("I");

11
tools/grib_tools.c
View File

@ -288,9 +288,10 @@ static int grib_tool_without_orderby(grib_runtime_options* options)
exit(1); exit(1);
} }
if (options->infile_offset) { if (options->infile_offset) {
#ifndef GRIB_ON_WINDOWS
/* Check at compile time to ensure our file offset is at least 64 bits */ /* Check at compile time to ensure our file offset is at least 64 bits */
COMPILE_TIME_ASSERT( sizeof(options->infile_offset) >= 8 ); COMPILE_TIME_ASSERT( sizeof(options->infile_offset) >= 8 );
#endif
err=fseeko(infile->file, options->infile_offset, SEEK_SET); err=fseeko(infile->file, options->infile_offset, SEEK_SET);
if (err) { if (err) {
/*fprintf(stderr, "Invalid file offset: %ld\n", options->infile_offset);*/ /*fprintf(stderr, "Invalid file offset: %ld\n", options->infile_offset);*/
@ -854,7 +855,7 @@ void grib_print_key_values(grib_runtime_options* options,grib_handle* h)
double v=0; double v=0;
/*if (grib_get_double_element(h,"values",options->index,&v) != GRIB_SUCCESS) {*/ /*if (grib_get_double_element(h,"values",options->index,&v) != GRIB_SUCCESS) {*/
if (1) { if (1) {
size_t size; size_t size, the_index = 0;
double* values; double* values;
int err=0; int err=0;
@ -866,6 +867,12 @@ void grib_print_key_values(grib_runtime_options* options,grib_handle* h)
} }
values=grib_context_malloc_clear(h->context,size*sizeof(double)); values=grib_context_malloc_clear(h->context,size*sizeof(double));
grib_get_double_array(h,"values",values,&size); grib_get_double_array(h,"values",values,&size);
the_index = options->index;
if (the_index >= size) {
fprintf(dump_file,"\n");
fprintf(stderr, "invalid index value %d (should be between 0 and %ld)\n", options->index, size-1);
exit(1);
}
v=values[options->index]; v=values[options->index];
grib_context_free(h->context,values); grib_context_free(h->context,values);
} }