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

Windows: refactor grib_tools.c scan

This commit is contained in:
Daniel Tipping 2019-01-10 17:42:10 +00:00
parent 667fc41f64
commit 6e97dc6858
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/grib_tools.c
View File

@ -535,28 +535,26 @@ static int scan(grib_context* c,grib_runtime_options* options,const char* dir)
return 0; return 0;
} }
#else #else
static void doProcessing(grib_context* c,grib_runtime_options* options,const char* dir, const struct _finddata_t *fileinfo)
{
if(strcmp(fileinfo->name, ".") != 0 && strcmp(fileinfo->name,"..") != 0) {
char buf[1024];
sprintf(buf,"%s/%s",dir,fileinfo->name);
process(c,options,buf);
}
}
static int scan(grib_context* c,grib_runtime_options* options,const char* dir) { static int scan(grib_context* c,grib_runtime_options* options,const char* dir) {
struct _finddata_t fileinfo; struct _finddata_t fileinfo;
intptr_t handle; intptr_t handle;
char buffer[1024]; char buffer[1024];
sprintf(buffer, "%s/*", dir); sprintf(buffer, "%s/*", dir);
if((handle = _findfirst(buffer, &fileinfo)) != -1) if((handle = _findfirst(buffer, &fileinfo)) != -1)
doProcessing(c, options, dir, &fileinfo); {
do {
if(strcmp(fileinfo.name, ".") != 0 && strcmp(fileinfo.name,"..") != 0) {
char buf[1024];
sprintf(buf, "%s/%s", dir, fileinfo.name);
process(c, options, buf);
}
} while(!_findnext(handle, &fileinfo));
}
else else
{ {
grib_context_log(c,(GRIB_LOG_ERROR) | (GRIB_LOG_PERROR) , "opendir %s",dir); grib_context_log(c,(GRIB_LOG_ERROR) | (GRIB_LOG_PERROR) , "opendir %s",dir);
return GRIB_IO_PROBLEM; return GRIB_IO_PROBLEM;
} }
while(!_findnext(handle, &fileinfo))
doProcessing(c, options, dir, &fileinfo);
return 0; return 0;
} }
#endif #endif