function wmo_read_any_from_file_offset renamed to wmo_read_any_from_file_with_offset + absolute offset

Author: danovaro

src/eccodes/eccodes_prototypes.h

@@ -410,7 +410,7 @@ off_t stdio_tell(void* data);
 int stdio_seek(void* data, off_t len);
 int stdio_seek_from_start(void* data, off_t len);
 size_t stdio_read(void* data, void* buf, size_t len, int* err);
-int wmo_read_any_from_file_offset(FILE* f, void* buffer, size_t* len, off_t* offset);
+int wmo_read_any_from_file_with_offset(FILE* f, void* buffer, size_t* len, off_t* offset);
 int wmo_read_any_from_file(FILE* f, void* buffer, size_t* len);
 int wmo_read_grib_from_file(FILE* f, void* buffer, size_t* len);
 int wmo_read_bufr_from_file(FILE* f, void* buffer, size_t* len);

src/eccodes/grib_api.h

@@ -1346,7 +1346,7 @@ void grib_get_reduced_row(long pl, double lon_first, double lon_last, long* npoi
 void grib_get_reduced_row_p(long pl, double lon_first, double lon_last, long* npoints, double* olon_first, double* olon_last);
 
 /* read products */
-int wmo_read_any_from_file_offset(FILE* f, void* buffer, size_t* len, off_t* offset);
+int wmo_read_any_from_file_with_offset(FILE* f, void* buffer, size_t* len, off_t* offset);
 int wmo_read_any_from_file(FILE* f, void* buffer, size_t* len);
 int wmo_read_grib_from_file(FILE* f, void* buffer, size_t* len);
 int wmo_read_bufr_from_file(FILE* f, void* buffer, size_t* len);

src/eccodes/grib_io.cc

@@ -1202,7 +1202,7 @@ static int ecc_wmo_read_any_from_file(FILE* f, void* buffer, size_t* len, off_t*
     return err;
 }
 
-int wmo_read_any_from_file_offset(FILE* f, void* buffer, size_t* len, off_t* offset)
+int wmo_read_any_from_file_with_offset(FILE* f, void* buffer, size_t* len, off_t* offset)
 {
     return ecc_wmo_read_any_from_file(f, buffer, len, offset, /*no_alloc=*/0, 1, 1, 1, 1);
 }

tests/CMakeLists.txt

@@ -13,7 +13,7 @@ list(APPEND test_c_bins
     wmo_read_bufr_from_file
     wmo_read_gts_from_file
     wmo_read_any_from_file
-    wmo_read_any_from_file_offset
+    wmo_read_any_from_file_with_offset
     wmo_read_any_from_stream
     grib_bpv_limit
     grib_double_cmp
@@ -220,7 +220,7 @@ if( HAVE_BUILD_TOOLS )
         wmo_read_bufr_from_file
         wmo_read_gts_from_file
         wmo_read_any_from_file
-        wmo_read_any_from_file_offset
+        wmo_read_any_from_file_with_offset
         wmo_read_any_from_stream
         bufr_templates
         bufr_rdbSubTypes

tests/wmo_read_any_from_file_offset.cc renamed to tests/wmo_read_any_from_file_with_offset.cc

@@ -19,7 +19,7 @@ int test_next(FILE* in, size_t* len, off_t offset_expected, off_t* offset) // ,
 {
     *len = SIZE;
 
-    int err = wmo_read_any_from_file_offset(in, buffer, len, offset);
+    int err = wmo_read_any_from_file_with_offset(in, buffer, len, offset);
     if (err == GRIB_END_OF_FILE && *len == 0)
         printf("end of file\n");
 

tests/wmo_read_any_from_file_offset.sh renamed to tests/wmo_read_any_from_file_with_offset.sh

@@ -10,15 +10,15 @@
 
 . ./include.ctest.sh
 
-label="wmo_read_any_from_file_offset_test"
+label="wmo_read_any_from_file_with_offset_test"
 tempText=temp.$label.txt
 
 if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
     echo "$0: This test is currently disabled on Windows"
     exit 0
 fi
 
-${test_dir}/wmo_read_any_from_file_offset $data_dir/pad.grib
+${test_dir}/wmo_read_any_from_file_with_offset $data_dir/pad.grib
 
 # Clean up
 rm -f $tempText