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

Refactoring

This commit is contained in:
Shahram Najm 2015-07-27 13:50:37 +01:00
parent 281815dd12
commit 0b8d658d11
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/grib_parse_utils.c
View File

@ -533,22 +533,24 @@ int grib_yyerror(const char* msg)
return 1; return 1;
} }
void grib_parser_include(const char* fname) void grib_parser_include(const char* included_fname)
{ {
FILE *f = NULL; FILE *f = NULL;
char path[1204]; char path[1204];
char* io_buffer=0; char* io_buffer=0;
/* int i; */ /* int i; */
Assert(top < MAXINCLUDE); Assert(top < MAXINCLUDE);
Assert(fname); Assert(included_fname);
if(parse_file == 0) if(parse_file == 0)
{ {
parse_file = fname; parse_file = included_fname;
Assert(top == 0); Assert(top == 0);
} }
else else
{ {
/* When parse_file is not NULL, it's the path of the parent file (includer) */
/* and 'included_fname' is the name of the file being included (includee) */
const char *p = parse_file; const char *p = parse_file;
const char *q = NULL; const char *q = NULL;
@ -559,16 +561,16 @@ void grib_parser_include(const char* fname)
if(!q) { if(!q) {
grib_context_log(grib_parser_context, GRIB_LOG_FATAL, grib_context_log(grib_parser_context, GRIB_LOG_FATAL,
"grib_parser_include: path '%s' does not contain a '/'\n",fname); "grib_parser_include: path '%s' does not contain a '/'\n",included_fname);
return; return;
} }
q++; q++;
strncpy(path,parse_file,q-parse_file); strncpy(path,parse_file,q-parse_file);
path[q-parse_file] = 0; path[q-parse_file] = 0;
strcat(path,fname); strcat(path,included_fname);
Assert(*fname != '/'); Assert(*included_fname != '/');
parse_file = path; parse_file = path;
} }