summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-09-08 03:00:37 (GMT)
committerWerner Almesberger <werner@almesberger.net>2016-09-08 03:00:37 (GMT)
commitf69451c8188aaab89c5dcbce2207f2e9ac94d734 (patch)
tree64b464225986cbff61e3ebc9c1a61de85340b1b2 /main
parent325eabdfe3a97e253862d731ad9604ffda819e6e (diff)
downloadeeshow-f69451c8188aaab89c5dcbce2207f2e9ac94d734.zip
eeshow-f69451c8188aaab89c5dcbce2207f2e9ac94d734.tar.gz
eeshow-f69451c8188aaab89c5dcbce2207f2e9ac94d734.tar.bz2
main/eeplot.c, gui/gui.c: use pl_parse_search
This also relaxes the error handling of eeshow: it no longer rejects a revision if it is unable to find the page layout file. the page layout file no longer causes
Diffstat (limited to 'main')
-rw-r--r--main/eeplot.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/main/eeplot.c b/main/eeplot.c
index e39394c..86bc4e7 100644
--- a/main/eeplot.c
+++ b/main/eeplot.c
@@ -222,16 +222,9 @@ int main(int argc, char **argv)
if (file_names.pro)
file_close(&pro_file);
- if (fn->pl) {
- struct file file;
-
- if (!file_open(&file, fn->pl, &sch_file))
- return 1;
- pl = pl_parse(&file);
- file_close(&file);
- if (!pl)
- return 1;
- }
+ pl = pl_parse_search(fn->pl, &sch_file);
+ if (!pl)
+ return 1;
if (fn != &file_names) {
free_file_names(fn);