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

Indexing: Make functions local

This commit is contained in:
Shahram Najm 2024-01-10 17:57:20 +00:00
parent ff522d0990
commit 45f47d1b90
2 changed files with 29 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/eccodes_prototypes.h
View File

@ -635,19 +635,6 @@ grib_action* grib_action_create_set_missing(grib_context* context, const char* n
/* grib_index.cc*/ /* grib_index.cc*/
int grib_index_compress(grib_index* index); int grib_index_compress(grib_index* index);
int grib_read_uchar(FILE* fh, unsigned char* val);
int grib_read_short(FILE* fh, short* val);
int grib_read_long(FILE* fh, long* val);
int grib_read_unsigned_long(FILE* fh, unsigned long* val);
int grib_write_uchar(FILE* fh, unsigned char val);
int grib_write_short(FILE* fh, short val);
int grib_write_long(FILE* fh, long val);
int grib_write_unsigned_long(FILE* fh, unsigned long val);
int grib_write_string(FILE* fh, const char* s);
int grib_write_identifier(FILE* fh, const char* id);
int grib_write_null_marker(FILE* fh);
int grib_write_not_null_marker(FILE* fh);
char* grib_read_string(grib_context* c, FILE* fh, int* err);
grib_field_tree* grib_read_field_tree(grib_context* c, FILE* fh, grib_file** files, int* err); grib_field_tree* grib_read_field_tree(grib_context* c, FILE* fh, grib_file** files, int* err);
grib_index* grib_index_new(grib_context* c, const char* key, int* err); grib_index* grib_index_new(grib_context* c, const char* key, int* err);
void grib_index_delete(grib_index* index); void grib_index_delete(grib_index* index);

58
src/grib_index.cc
View File

@ -274,7 +274,7 @@ static grib_index_key* grib_index_new_key(grib_context* c, grib_index_key* keys,
return keys; return keys;
} }
int grib_read_uchar(FILE* fh, unsigned char* val) static int grib_read_uchar(FILE* fh, unsigned char* val)
{ {
if (fread(val, sizeof(unsigned char), 1, fh) < 1) { if (fread(val, sizeof(unsigned char), 1, fh) < 1) {
if (feof(fh)) if (feof(fh))
@ -285,7 +285,7 @@ int grib_read_uchar(FILE* fh, unsigned char* val)
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }
int grib_read_short(FILE* fh, short* val) static int grib_read_short(FILE* fh, short* val)
{ {
if (fread(val, sizeof(short), 1, fh) < 1) { if (fread(val, sizeof(short), 1, fh) < 1) {
if (feof(fh)) if (feof(fh))
@ -296,7 +296,18 @@ int grib_read_short(FILE* fh, short* val)
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }
int grib_read_long(FILE* fh, long* val) // static int grib_read_long(FILE* fh, long* val)
// {
// if (fread(val, sizeof(long), 1, fh) < 1) {
// if (feof(fh))
// return GRIB_END_OF_FILE;
// else
// return GRIB_IO_PROBLEM;
// }
// return GRIB_SUCCESS;
// }
static int grib_read_unsigned_long(FILE* fh, unsigned long* val)
{ {
if (fread(val, sizeof(long), 1, fh) < 1) { if (fread(val, sizeof(long), 1, fh) < 1) {
if (feof(fh)) if (feof(fh))
@ -307,46 +318,35 @@ int grib_read_long(FILE* fh, long* val)
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }
int grib_read_unsigned_long(FILE* fh, unsigned long* val) static int grib_write_uchar(FILE* fh, unsigned char val)
{
if (fread(val, sizeof(long), 1, fh) < 1) {
if (feof(fh))
return GRIB_END_OF_FILE;
else
return GRIB_IO_PROBLEM;
}
return GRIB_SUCCESS;
}
int grib_write_uchar(FILE* fh, unsigned char val)
{ {
if (fwrite(&val, sizeof(unsigned char), 1, fh) < 1) if (fwrite(&val, sizeof(unsigned char), 1, fh) < 1)
return GRIB_IO_PROBLEM; return GRIB_IO_PROBLEM;
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }
int grib_write_short(FILE* fh, short val) static int grib_write_short(FILE* fh, short val)
{ {
if (fwrite(&val, sizeof(short), 1, fh) < 1) if (fwrite(&val, sizeof(short), 1, fh) < 1)
return GRIB_IO_PROBLEM; return GRIB_IO_PROBLEM;
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }
int grib_write_long(FILE* fh, long val) // static int grib_write_long(FILE* fh, long val)
// {
// if (fwrite(&val, sizeof(long), 1, fh) < 1)
// return GRIB_IO_PROBLEM;
// return GRIB_SUCCESS;
// }
static int grib_write_unsigned_long(FILE* fh, unsigned long val)
{ {
if (fwrite(&val, sizeof(long), 1, fh) < 1) if (fwrite(&val, sizeof(long), 1, fh) < 1)
return GRIB_IO_PROBLEM; return GRIB_IO_PROBLEM;
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }
int grib_write_unsigned_long(FILE* fh, unsigned long val) static int grib_write_string(FILE* fh, const char* s)
{
if (fwrite(&val, sizeof(long), 1, fh) < 1)
return GRIB_IO_PROBLEM;
return GRIB_SUCCESS;
}
int grib_write_string(FILE* fh, const char* s)
{ {
size_t len = 0; size_t len = 0;
if (s == NULL) if (s == NULL)
@ -358,22 +358,22 @@ int grib_write_string(FILE* fh, const char* s)
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }
int grib_write_identifier(FILE* fh, const char* ID) static int grib_write_identifier(FILE* fh, const char* ID)
{ {
return grib_write_string(fh, ID); return grib_write_string(fh, ID);
} }
int grib_write_null_marker(FILE* fh) static int grib_write_null_marker(FILE* fh)
{ {
return grib_write_uchar(fh, NULL_MARKER); return grib_write_uchar(fh, NULL_MARKER);
} }
int grib_write_not_null_marker(FILE* fh) static int grib_write_not_null_marker(FILE* fh)
{ {
return grib_write_uchar(fh, NOT_NULL_MARKER); return grib_write_uchar(fh, NOT_NULL_MARKER);
} }
char* grib_read_string(grib_context* c, FILE* fh, int* err) static char* grib_read_string(grib_context* c, FILE* fh, int* err)
{ {
unsigned char len = 0; unsigned char len = 0;
char* s = NULL; char* s = NULL;