summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-09-06 23:05:54 -0300
committerWerner Almesberger <werner@almesberger.net>2016-09-07 00:00:36 -0300
commitcaf9a772d510ac38bf219eb074fe3f370d92a5ae (patch)
tree4221b1394a9f0e1e9406b8a31a2503757fdd0472
parent38a7235477becdb9c9343a73e20bfddb3d0a99f2 (diff)
downloadeeshow-caf9a772d510ac38bf219eb074fe3f370d92a5ae.tar.gz
eeshow-caf9a772d510ac38bf219eb074fe3f370d92a5ae.tar.bz2
eeshow-caf9a772d510ac38bf219eb074fe3f370d92a5ae.zip
gfx/diff.c, main/eeplot.c, gui/gui.c: search library paths
-rw-r--r--gfx/diff.c2
-rw-r--r--gui/gui.c4
-rw-r--r--main/eeplot.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/gfx/diff.c b/gfx/diff.c
index b23370d..096c252 100644
--- a/gfx/diff.c
+++ b/gfx/diff.c
@@ -180,7 +180,7 @@ void *diff_process_file(struct diff *diff, struct file_names *file_names,
if (!file_open(&sch_file, fn->sch, file_names->pro ? &pro_file : NULL))
goto fail_open;
for (i = 0 ; i != fn->n_libs; i++)
- if (!lib_parse(&lib, fn->libs[i], &sch_file))
+ if (!lib_parse_search(&lib, fn->libs[i], fn, &sch_file))
goto fail_parse;
if (!sch_parse(&sch, &sch_file, &lib, NULL))
goto fail_parse;
diff --git a/gui/gui.c b/gui/gui.c
index aa71b1f..5cd2a75 100644
--- a/gui/gui.c
+++ b/gui/gui.c
@@ -267,8 +267,8 @@ static const struct sheet *parse_files(struct gui_hist *hist,
lib_init(&hist->lib);
for (libs_open = 0; libs_open != fn->n_libs; libs_open++)
- if (!file_open(lib_files + libs_open, fn->libs[libs_open],
- leader))
+ if (!lib_find_file(lib_files + libs_open, fn->libs[libs_open],
+ fn, leader))
goto fail;
if (fn->pl) {
diff --git a/main/eeplot.c b/main/eeplot.c
index cc537ab..e39394c 100644
--- a/main/eeplot.c
+++ b/main/eeplot.c
@@ -215,7 +215,7 @@ int main(int argc, char **argv)
lib_init(&lib);
for (i = 0; i != fn->n_libs; i++)
- if (!lib_parse(&lib, fn->libs[i],
+ if (!lib_parse_search(&lib, fn->libs[i], fn,
file_names.pro ? &pro_file : &sch_file))
return 1;