diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-07-05 20:40:15 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-07-05 20:40:15 +0000 |
| commit | d97128c9164d3724190da3044642d30045055fc7 (patch) | |
| tree | 477f475b7bc5851000023b7244274ddf0a3a932b /navit/map | |
| parent | 7f202ea8c325a94fbef1392ad8268e6ab69162f2 (diff) | |
| download | navit-d97128c9164d3724190da3044642d30045055fc7.tar.gz | |
Fix:core:Suppress bogus warning if bookmark.txt or destination.txt do not (yet) exist.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5183 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/map')
| -rw-r--r-- | navit/map/textfile/textfile.c | 6 | ||||
| -rw-r--r-- | navit/map/textfile/textfile.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/navit/map/textfile/textfile.c b/navit/map/textfile/textfile.c index 89dccd9aa..c9713cd83 100644 --- a/navit/map/textfile/textfile.c +++ b/navit/map/textfile/textfile.c @@ -214,7 +214,9 @@ map_rect_new_textfile(struct map_priv *map, struct map_selection *sel) mr->f=fopen(map->filename, "r"); } if(!mr->f) { - dbg(0, "error opening textfile %s: %s\n",map->filename, strerror(errno)); + if (!(errno == ENOENT && map->no_warning_if_map_file_missing)) { + dbg(0, "error opening textfile %s: %s\n", map->filename, strerror(errno)); + } } get_line(mr); return mr; @@ -351,6 +353,7 @@ map_new_textfile(struct map_methods *meth, struct attr **attrs, struct callback_ struct attr *data=attr_search(attrs, NULL, attr_data); struct attr *charset=attr_search(attrs, NULL, attr_charset); struct attr *flags=attr_search(attrs, NULL, attr_flags); + struct attr *no_warn=attr_search(attrs, NULL, attr_no_warning_if_map_file_missing); struct file_wordexp *wexp; int len,is_pipe=0; char *wdata; @@ -372,6 +375,7 @@ map_new_textfile(struct map_methods *meth, struct attr **attrs, struct callback_ m->id=++map_id; m->filename=g_strdup(wexp_data[0]); m->is_pipe=is_pipe; + m->no_warning_if_map_file_missing=(no_warn!=NULL) && (no_warn->u.num); if (flags) m->flags=flags->u.num; dbg(1,"map_new_textfile %s %s\n", m->filename, wdata); diff --git a/navit/map/textfile/textfile.h b/navit/map/textfile/textfile.h index 75e5401f2..8cfa69737 100644 --- a/navit/map/textfile/textfile.h +++ b/navit/map/textfile/textfile.h @@ -28,6 +28,7 @@ struct map_priv { char *filename; char *charset; int is_pipe; + int no_warning_if_map_file_missing; int flags; }; |