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

Fortran: any_f_scan_file_ check for errors

This commit is contained in:
Shahram Najm 2024-01-02 16:04:02 +00:00
parent 4047c5764c
commit 4cd68b210f
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
fortran/grib_fortran.c
View File

@ -1441,52 +1441,59 @@ int any_f_scan_file_(int* fid, int* n) {
/* this needs a callback to a destructor*/ /* this needs a callback to a destructor*/
/* grib_oarray_delete_content(c,binary_messages); */ /* grib_oarray_delete_content(c,binary_messages); */
grib_oarray_delete(c,info_messages); grib_oarray_delete(c, info_messages);
info_messages=grib_oarray_new(c,1000,1000); info_messages=grib_oarray_new(c, 1000, 1000);
if (f) { if (f) {
while (err!=GRIB_END_OF_FILE) { while (err!=GRIB_END_OF_FILE) {
data = wmo_read_any_from_file_malloc ( f, 0,&olen,&offset,&err ); data = wmo_read_any_from_file_malloc ( f, 0, &olen, &offset, &err );
msg=(l_message_info*)grib_context_malloc_clear(c,sizeof(l_message_info)); msg=(l_message_info*)grib_context_malloc_clear(c,sizeof(l_message_info));
msg->offset=offset; msg->offset = offset;
msg->size=olen; msg->size = olen;
if (err==0 && data) grib_oarray_push(c,info_messages,msg); if (err == 0 && data) grib_oarray_push(c, info_messages, msg);
grib_context_free(c,data); grib_context_free(c, data);
} }
if (err==GRIB_END_OF_FILE) err=0; if (err == GRIB_END_OF_FILE) err = 0;
} }
*n=info_messages->n; *n = info_messages->n;
return err; return err;
} }
/*****************************************************************************/ /*****************************************************************************/
int any_f_new_from_scanned_file_(int* fid,int* msgid,int* gid) int any_f_new_from_scanned_file_(int* fid, int* msgid, int* gid)
{ {
grib_handle *h = NULL; grib_handle *h = NULL;
grib_context* c=grib_context_get_default(); grib_context* c = grib_context_get_default();
int err=0; int err = 0;
FILE* f = get_file(*fid); FILE* f = get_file(*fid);
/* fortran convention of 1 based index*/ if (info_messages == NULL) {
const int n=*msgid-1; return GRIB_INVALID_ARGUMENT;
}
if (*msgid < 1 || *msgid > info_messages->n) {
return GRIB_INVALID_ARGUMENT;
}
l_message_info* msg=(l_message_info*)grib_oarray_get(info_messages,n); /* fortran convention of 1-based index */
const int n = *msgid - 1;
l_message_info* msg=(l_message_info*)grib_oarray_get(info_messages, n);
if (msg && f) { if (msg && f) {
GRIB_MUTEX_INIT_ONCE(&once,&init); GRIB_MUTEX_INIT_ONCE(&once, &init);
GRIB_MUTEX_LOCK(&read_mutex); GRIB_MUTEX_LOCK(&read_mutex);
fseeko(f,msg->offset,SEEK_SET); fseeko(f, msg->offset, SEEK_SET);
h=any_new_from_file (c,f,&err); h = any_new_from_file (c, f, &err);
GRIB_MUTEX_UNLOCK(&read_mutex); GRIB_MUTEX_UNLOCK(&read_mutex);
} }
if (err) return err; if (err) return err;
if(h){ if (h) {
push_handle(h,gid); push_handle(h, gid);
return GRIB_SUCCESS; return GRIB_SUCCESS;
} else { } else {
*gid=-1; *gid = -1;
return GRIB_END_OF_FILE; return GRIB_END_OF_FILE;
} }
} }