From b90ea68fd126e555122b25aa567555f9f7035078 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 11 May 2013 20:07:28 -0700 Subject: Disable non-functional Cochran code There's no point in compiling this into the binary. It does not work. Signed-off-by: Dirk Hohndel --- Makefile | 2 +- file.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 374de8a90..5745e948f 100644 --- a/Makefile +++ b/Makefile @@ -167,7 +167,7 @@ GTKOBJS = info-gtk.o divelist-gtk.o planner-gtk.o statistics-gtk.o gtk-gui.o OBJS = main.o dive.o time.o profile.o info.o equipment.o divelist.o deco.o planner.o \ parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o uemis-downloader.o \ - statistics.o file.o cochran.o device.o download-dialog.o prefs.o \ + statistics.o file.o device.o download-dialog.o prefs.o \ webservice.o sha1.o $(GPSOBJ) $(OSSUPPORT).o $(RESFILE) $(GTKOBJS) DEPS = $(wildcard .dep/*.dep) diff --git a/file.c b/file.c index 0e71a5801..bb7121bbd 100644 --- a/file.c +++ b/file.c @@ -233,9 +233,11 @@ static int open_by_filename(const char *filename, const char *fmt, struct memblo if (!strcasecmp(fmt, "DLD")) return try_to_open_zip(filename, mem, error); +#if ONCE_COCHRAN_IS_SUPPORTED /* Truly nasty intentionally obfuscated Cochran Anal software */ if (!strcasecmp(fmt, "CAN")) return try_to_open_cochran(filename, mem, error); +#endif /* Cochran export comma-separated-value files */ if (!strcasecmp(fmt, "DPT")) -- cgit v1.2.3-70-g09d2