From 866e636e8c5b310f9b1701c72a75411c6b5c0b57 Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Tue, 17 Jul 2012 23:07:29 +0200 Subject: [PATCH] Move the logging code to the examples. With the application defined logging function, the actual logging is not performed by the library anymore, and the code belongs in the applications. --- examples/Makefile.am | 3 ++- examples/common.c | 3 +-- examples/cressi_edy_test.c | 2 +- examples/hw_frog_test.c | 2 +- examples/hw_ostc_test.c | 2 +- examples/mares_darwin_test.c | 2 +- examples/mares_iconhd_test.c | 2 +- examples/mares_nemo_test.c | 2 +- examples/mares_puck_test.c | 2 +- examples/oceanic_atom2_test.c | 2 +- examples/oceanic_veo250_test.c | 2 +- examples/oceanic_vtpro_test.c | 2 +- examples/reefnet_sensus_test.c | 2 +- examples/reefnet_sensuspro_test.c | 2 +- examples/reefnet_sensusultra_test.c | 2 +- examples/suunto_d9_test.c | 2 +- examples/suunto_eon_test.c | 2 +- examples/suunto_solution_test.c | 2 +- examples/suunto_vyper2_test.c | 2 +- examples/suunto_vyper_test.c | 2 +- examples/universal.c | 2 +- {src => examples}/utils.c | 2 +- {include/libdivecomputer => examples}/utils.h | 6 +++--- examples/uwatec_aladin_test.c | 2 +- examples/uwatec_memomouse_test.c | 2 +- examples/uwatec_smart_test.c | 2 +- examples/zeagle_n2ition3_test.c | 2 +- include/libdivecomputer/Makefile.am | 1 - src/Makefile.am | 3 +-- src/libdivecomputer.symbols | 3 --- 30 files changed, 31 insertions(+), 36 deletions(-) rename {src => examples}/utils.c (98%) rename {include/libdivecomputer => examples}/utils.h (93%) diff --git a/examples/Makefile.am b/examples/Makefile.am index 8db96b0..37155c2 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -29,7 +29,8 @@ if IRDA bin_PROGRAMS += smart endif -COMMON = common.c common.h +COMMON = common.c common.h \ + utils.c utils.h universal_SOURCES = universal.c $(COMMON) diff --git a/examples/common.c b/examples/common.c index a7785fe..1f1ea3d 100644 --- a/examples/common.c +++ b/examples/common.c @@ -19,9 +19,8 @@ * MA 02110-1301 USA */ -#include - #include "common.h" +#include "utils.h" const char * errmsg (dc_status_t rc) diff --git a/examples/cressi_edy_test.c b/examples/cressi_edy_test.c index 29b6eff..fb23a11 100644 --- a/examples/cressi_edy_test.c +++ b/examples/cressi_edy_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/hw_frog_test.c b/examples/hw_frog_test.c index 71e26bd..0582c40 100644 --- a/examples/hw_frog_test.c +++ b/examples/hw_frog_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/hw_ostc_test.c b/examples/hw_ostc_test.c index 0bdaf32..ca8d3b7 100644 --- a/examples/hw_ostc_test.c +++ b/examples/hw_ostc_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/mares_darwin_test.c b/examples/mares_darwin_test.c index 2c4c16d..e239a80 100644 --- a/examples/mares_darwin_test.c +++ b/examples/mares_darwin_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/mares_iconhd_test.c b/examples/mares_iconhd_test.c index 806b73d..61f0ea6 100644 --- a/examples/mares_iconhd_test.c +++ b/examples/mares_iconhd_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/mares_nemo_test.c b/examples/mares_nemo_test.c index 30b8d95..6a0d118 100644 --- a/examples/mares_nemo_test.c +++ b/examples/mares_nemo_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/mares_puck_test.c b/examples/mares_puck_test.c index b7c9209..c27a87a 100644 --- a/examples/mares_puck_test.c +++ b/examples/mares_puck_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/oceanic_atom2_test.c b/examples/oceanic_atom2_test.c index 6a331ce..63ec51e 100644 --- a/examples/oceanic_atom2_test.c +++ b/examples/oceanic_atom2_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/oceanic_veo250_test.c b/examples/oceanic_veo250_test.c index 61dbc34..d0b08a7 100644 --- a/examples/oceanic_veo250_test.c +++ b/examples/oceanic_veo250_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/oceanic_vtpro_test.c b/examples/oceanic_vtpro_test.c index 9492e10..8493ce6 100644 --- a/examples/oceanic_vtpro_test.c +++ b/examples/oceanic_vtpro_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/reefnet_sensus_test.c b/examples/reefnet_sensus_test.c index 7ba33a5..dc6a345 100644 --- a/examples/reefnet_sensus_test.c +++ b/examples/reefnet_sensus_test.c @@ -23,8 +23,8 @@ #include // time #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/reefnet_sensuspro_test.c b/examples/reefnet_sensuspro_test.c index 59f3af0..0115708 100644 --- a/examples/reefnet_sensuspro_test.c +++ b/examples/reefnet_sensuspro_test.c @@ -23,8 +23,8 @@ #include // time #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/reefnet_sensusultra_test.c b/examples/reefnet_sensusultra_test.c index 6f537cc..1ab35ef 100644 --- a/examples/reefnet_sensusultra_test.c +++ b/examples/reefnet_sensusultra_test.c @@ -23,8 +23,8 @@ #include // time #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/suunto_d9_test.c b/examples/suunto_d9_test.c index 9b7b8ba..4c49743 100644 --- a/examples/suunto_d9_test.c +++ b/examples/suunto_d9_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/suunto_eon_test.c b/examples/suunto_eon_test.c index bb940c0..141848b 100644 --- a/examples/suunto_eon_test.c +++ b/examples/suunto_eon_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/suunto_solution_test.c b/examples/suunto_solution_test.c index 01a2982..c17afc6 100644 --- a/examples/suunto_solution_test.c +++ b/examples/suunto_solution_test.c @@ -1,8 +1,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/suunto_vyper2_test.c b/examples/suunto_vyper2_test.c index d9e9a3f..8d7724c 100644 --- a/examples/suunto_vyper2_test.c +++ b/examples/suunto_vyper2_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/suunto_vyper_test.c b/examples/suunto_vyper_test.c index e3f949f..3e074c1 100644 --- a/examples/suunto_vyper_test.c +++ b/examples/suunto_vyper_test.c @@ -23,8 +23,8 @@ #include // atoi #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/universal.c b/examples/universal.c index cb099c0..bbc717d 100644 --- a/examples/universal.c +++ b/examples/universal.c @@ -37,8 +37,8 @@ #include #include #include -#include +#include "utils.h" #include "common.h" static const char *g_cachedir = NULL; diff --git a/src/utils.c b/examples/utils.c similarity index 98% rename from src/utils.c rename to examples/utils.c index fc26f13..5c14e73 100644 --- a/src/utils.c +++ b/examples/utils.c @@ -23,7 +23,7 @@ #include #include -#include +#include "utils.h" static FILE* g_logfile = NULL; diff --git a/include/libdivecomputer/utils.h b/examples/utils.h similarity index 93% rename from include/libdivecomputer/utils.h rename to examples/utils.h index 7005c1f..ff22a45 100644 --- a/include/libdivecomputer/utils.h +++ b/examples/utils.h @@ -19,8 +19,8 @@ * MA 02110-1301 USA */ -#ifndef DEBUG_H -#define DEBUG_H +#ifndef EXAMPLES_UTILS_H +#define EXAMPLES_UTILS_H #ifdef __cplusplus extern "C" { @@ -36,4 +36,4 @@ void message_set_logfile (const char* filename); } #endif /* __cplusplus */ -#endif /* DEBUG_H */ +#endif /* EXAMPLES_UTILS_H */ diff --git a/examples/uwatec_aladin_test.c b/examples/uwatec_aladin_test.c index 859fd5c..5de5771 100644 --- a/examples/uwatec_aladin_test.c +++ b/examples/uwatec_aladin_test.c @@ -1,8 +1,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/uwatec_memomouse_test.c b/examples/uwatec_memomouse_test.c index f06f9bc..d482ecd 100644 --- a/examples/uwatec_memomouse_test.c +++ b/examples/uwatec_memomouse_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/uwatec_smart_test.c b/examples/uwatec_smart_test.c index bb5b4cb..c3b88dd 100644 --- a/examples/uwatec_smart_test.c +++ b/examples/uwatec_smart_test.c @@ -24,8 +24,8 @@ #include // memset #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/examples/zeagle_n2ition3_test.c b/examples/zeagle_n2ition3_test.c index 2a6ced1..96253ee 100644 --- a/examples/zeagle_n2ition3_test.c +++ b/examples/zeagle_n2ition3_test.c @@ -22,8 +22,8 @@ #include // fopen, fwrite, fclose #include -#include +#include "utils.h" #include "common.h" dc_status_t diff --git a/include/libdivecomputer/Makefile.am b/include/libdivecomputer/Makefile.am index 2505889..80cfd9d 100644 --- a/include/libdivecomputer/Makefile.am +++ b/include/libdivecomputer/Makefile.am @@ -3,7 +3,6 @@ libdivecomputer_HEADERS = \ version.h \ common.h \ context.h \ - utils.h \ buffer.h \ descriptor.h \ iterator.h \ diff --git a/src/Makefile.am b/src/Makefile.am index 9fcfb14..89d0ab1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -47,8 +47,7 @@ libdivecomputer_la_SOURCES = \ ringbuffer.h ringbuffer.c \ checksum.h checksum.c \ array.h array.c \ - buffer.c \ - utils.c + buffer.c if OS_WIN32 libdivecomputer_la_SOURCES += serial.h serial_win32.c diff --git a/src/libdivecomputer.symbols b/src/libdivecomputer.symbols index 652c011..24718d3 100644 --- a/src/libdivecomputer.symbols +++ b/src/libdivecomputer.symbols @@ -75,9 +75,6 @@ dc_device_set_fingerprint dc_device_version dc_device_write -message -message_set_logfile - cressi_edy_device_open mares_nemo_device_open mares_nemo_extract_dives