diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-02-02 11:48:58 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-02-02 15:54:50 +0100 |
| commit | 72daa122b6a4a9562109299d0b747c71aac1e483 (patch) | |
| tree | cc1dff80e1e89158b0cac778433fcea5c08ae5f9 /package/config/lex.zconf.c_shipped | |
| parent | 359a922659c6b33c44ab7c4f94de7d801a8bea63 (diff) | |
package/config: rebase against 2.6.37-rc1
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/config/lex.zconf.c_shipped')
| -rw-r--r-- | package/config/lex.zconf.c_shipped | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package/config/lex.zconf.c_shipped b/package/config/lex.zconf.c_shipped index fdc7113b0..6eb039718 100644 --- a/package/config/lex.zconf.c_shipped +++ b/package/config/lex.zconf.c_shipped @@ -2373,9 +2373,10 @@ void zconf_nextfile(const char *name) memset(buf, 0, sizeof(*buf)); current_buf->state = YY_CURRENT_BUFFER; - zconfin = zconf_fopen(name); + zconfin = zconf_fopen(file->name); if (!zconfin) { - printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name); + printf("%s:%d: can't open file \"%s\"\n", + zconf_curname(), zconf_lineno(), file->name); exit(1); } zconf_switch_to_buffer(zconf_create_buffer(zconfin,YY_BUF_SIZE)); @@ -2422,7 +2423,7 @@ int zconf_lineno(void) return current_pos.lineno; } -char *zconf_curname(void) +const char *zconf_curname(void) { return current_pos.file ? current_pos.file->name : "<none>"; } |