From bbc29bdb2feb33ff8ba1f632d0515b7fc8af0155 Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 4 Feb 2017 19:28:31 +0100 Subject: [PATCH] switched to absolute include dirs, formatting --- src/ebusd/Makefile.am | 3 ++- src/ebusd/bushandler.cpp | 12 ++++----- src/ebusd/bushandler.h | 14 +++++------ src/ebusd/datahandler.cpp | 4 +-- src/ebusd/datahandler.h | 4 +-- src/ebusd/main.cpp | 23 +++++++++-------- src/ebusd/main.h | 10 +++++--- src/ebusd/mainloop.cpp | 8 +++--- src/ebusd/mainloop.h | 14 ++++++----- src/ebusd/mqtthandler.cpp | 34 ++++++++++++-------------- src/ebusd/mqtthandler.h | 6 ++--- src/ebusd/network.cpp | 4 +-- src/ebusd/network.h | 12 +++++---- src/lib/ebus/Makefile.am | 3 ++- src/lib/ebus/contrib/Makefile.am | 4 +-- src/lib/ebus/contrib/contrib.cpp | 4 +-- src/lib/ebus/contrib/tem.cpp | 4 +-- src/lib/ebus/contrib/tem.h | 6 ++--- src/lib/ebus/contrib/test/Makefile.am | 4 +-- src/lib/ebus/contrib/test/test_tem.cpp | 4 +-- src/lib/ebus/data.cpp | 2 +- src/lib/ebus/data.h | 8 +++--- src/lib/ebus/datatype.cpp | 4 +-- src/lib/ebus/datatype.h | 8 +++--- src/lib/ebus/device.cpp | 4 +-- src/lib/ebus/device.h | 2 +- src/lib/ebus/filereader.h | 4 +-- src/lib/ebus/message.cpp | 11 +++++---- src/lib/ebus/message.h | 6 ++--- src/lib/ebus/result.cpp | 2 +- src/lib/ebus/symbol.cpp | 4 +-- src/lib/ebus/symbol.h | 2 +- src/lib/ebus/test/Makefile.am | 2 +- src/lib/ebus/test/test_data.cpp | 2 +- src/lib/ebus/test/test_device.cpp | 2 +- src/lib/ebus/test/test_filereader.cpp | 2 +- src/lib/ebus/test/test_message.cpp | 2 +- src/lib/ebus/test/test_symbol.cpp | 2 +- src/lib/utils/Makefile.am | 3 ++- src/lib/utils/clock.cpp | 2 +- src/lib/utils/log.cpp | 4 +-- src/lib/utils/queue.h | 2 +- src/lib/utils/rotatefile.cpp | 4 +-- src/lib/utils/tcpsocket.cpp | 2 +- src/lib/utils/thread.cpp | 4 +-- src/tools/Makefile.am | 3 +-- src/tools/ebusctl.cpp | 2 +- src/tools/ebusfeed.cpp | 4 +-- 48 files changed, 143 insertions(+), 133 deletions(-) diff --git a/src/ebusd/Makefile.am b/src/ebusd/Makefile.am index 99cc4645..32be82f8 100644 --- a/src/ebusd/Makefile.am +++ b/src/ebusd/Makefile.am @@ -1,4 +1,5 @@ -AM_CXXFLAGS = -Wconversion -Wno-unused-parameter \ +AM_CXXFLAGS = -I$(top_srcdir)/src \ + -Wconversion -Wno-unused-parameter \ -isystem$(top_srcdir)/src/lib/utils \ -isystem$(top_srcdir)/src/lib/ebus \ -DSYSCONFDIR=\"$(sysconfdir)\" \ diff --git a/src/ebusd/bushandler.cpp b/src/ebusd/bushandler.cpp index 51367a1e..8445743b 100644 --- a/src/ebusd/bushandler.cpp +++ b/src/ebusd/bushandler.cpp @@ -20,7 +20,7 @@ # include #endif -#include "bushandler.h" +#include "ebusd/bushandler.h" #include #include #include @@ -28,11 +28,11 @@ #include #include #include -#include "message.h" -#include "data.h" -#include "result.h" -#include "symbol.h" -#include "log.h" +#include "lib/ebus/message.h" +#include "lib/ebus/data.h" +#include "lib/ebus/result.h" +#include "lib/ebus/symbol.h" +#include "lib/utils/log.h" namespace ebusd { diff --git a/src/ebusd/bushandler.h b/src/ebusd/bushandler.h index 54a82173..09ab45bd 100644 --- a/src/ebusd/bushandler.h +++ b/src/ebusd/bushandler.h @@ -25,13 +25,13 @@ #include #include #include -#include "message.h" -#include "data.h" -#include "symbol.h" -#include "result.h" -#include "device.h" -#include "queue.h" -#include "thread.h" +#include "lib/ebus/message.h" +#include "lib/ebus/data.h" +#include "lib/ebus/symbol.h" +#include "lib/ebus/result.h" +#include "lib/ebus/device.h" +#include "lib/utils/queue.h" +#include "lib/utils/thread.h" /** @file bushandler.h * Classes, functions, and constants related to handling of symbols on the eBUS. diff --git a/src/ebusd/datahandler.cpp b/src/ebusd/datahandler.cpp index 0cd88124..30ce95d7 100644 --- a/src/ebusd/datahandler.cpp +++ b/src/ebusd/datahandler.cpp @@ -20,11 +20,11 @@ # include #endif -#include "datahandler.h" +#include "ebusd/datahandler.h" #include #include #ifdef HAVE_MQTT -# include "mqtthandler.h" +# include "ebusd/mqtthandler.h" #endif namespace ebusd { diff --git a/src/ebusd/datahandler.h b/src/ebusd/datahandler.h index 6608fa28..4766db03 100644 --- a/src/ebusd/datahandler.h +++ b/src/ebusd/datahandler.h @@ -22,8 +22,8 @@ #include #include #include -#include "bushandler.h" -#include "message.h" +#include "ebusd/bushandler.h" +#include "lib/ebus/message.h" /** @file datahandler.h * Classes and functions for implementing and registering generic data sinks diff --git a/src/ebusd/main.cpp b/src/ebusd/main.cpp index 3c25cdd9..bd13646d 100644 --- a/src/ebusd/main.cpp +++ b/src/ebusd/main.cpp @@ -20,7 +20,7 @@ # include #endif -#include "main.h" +#include "ebusd/main.h" #include #include #include @@ -33,10 +33,10 @@ #include #include #include -#include "mainloop.h" -#include "bushandler.h" -#include "log.h" -#include "rotatefile.h" +#include "ebusd/mainloop.h" +#include "ebusd/bushandler.h" +#include "lib/utils/log.h" +#include "lib/utils/rotatefile.h" namespace ebusd { @@ -849,21 +849,24 @@ result_t loadScanConfigFile(MessageMap* messages, unsigned char address, SymbolS out.str(""); offset = (unsigned char)(offset+(*identFields)[field++]->getLength(partType)); result = (*identFields)[field]->read(partType, data, offset, sw, 0); // software version number - if (result==RESULT_ERR_OUT_OF_RANGE) { - sw = (data[(partType==pt_masterData ? 5 : 1)+offset]<<16)|data[(partType==pt_masterData ? 5 : 1)+offset+1]; + if (result == RESULT_ERR_OUT_OF_RANGE) { + sw = (data[(partType == pt_masterData ? 5 : 1)+offset] << 16) + | data[(partType == pt_masterData ? 5 : 1)+offset+1]; result = RESULT_OK; } } if (result == RESULT_OK) { offset = (unsigned char)(offset+(*identFields)[field++]->getLength(partType)); result = (*identFields)[field]->read(partType, data, offset, hw, 0); // hardware version number - if (result==RESULT_ERR_OUT_OF_RANGE) { - hw = (data[(partType==pt_masterData ? 5 : 1)+offset]<<16)|data[(partType==pt_masterData ? 5 : 1)+offset+1]; + if (result == RESULT_ERR_OUT_OF_RANGE) { + hw = (data[(partType == pt_masterData ? 5 : 1)+offset] << 16) + | data[(partType == pt_masterData ? 5 : 1)+offset+1]; result = RESULT_OK; } } if (result != RESULT_OK) { - logError(lf_main, "unable to load scan config %2.2x: decode field %s %s", address, identFields->getName(field).c_str(), getResultCode(result)); + logError(lf_main, "unable to load scan config %2.2x: decode field %s %s", address, + identFields->getName(field).c_str(), getResultCode(result)); return result; } vector files; diff --git a/src/ebusd/main.h b/src/ebusd/main.h index 2d90585f..1a3fe0f2 100644 --- a/src/ebusd/main.h +++ b/src/ebusd/main.h @@ -21,11 +21,13 @@ #include #include -#include "data.h" -#include "message.h" -#include "result.h" +#include "lib/ebus/data.h" +#include "lib/ebus/message.h" +#include "lib/ebus/result.h" -/** \file main.h */ +/** \file main.h + * The main entry method doing all the startup handling. + */ namespace ebusd { diff --git a/src/ebusd/mainloop.cpp b/src/ebusd/mainloop.cpp index 7233bd10..6870ba5a 100644 --- a/src/ebusd/mainloop.cpp +++ b/src/ebusd/mainloop.cpp @@ -20,12 +20,12 @@ # include #endif -#include "mainloop.h" +#include "ebusd/mainloop.h" #include #include -#include "main.h" -#include "log.h" -#include "data.h" +#include "ebusd/main.h" +#include "lib/utils/log.h" +#include "lib/ebus/data.h" namespace ebusd { diff --git a/src/ebusd/mainloop.h b/src/ebusd/mainloop.h index a27399dd..1733b1fa 100644 --- a/src/ebusd/mainloop.h +++ b/src/ebusd/mainloop.h @@ -22,13 +22,15 @@ #include #include #include -#include "bushandler.h" -#include "datahandler.h" -#include "network.h" -#include "message.h" -#include "rotatefile.h" +#include "ebusd/bushandler.h" +#include "ebusd/datahandler.h" +#include "ebusd/network.h" +#include "lib/ebus/message.h" +#include "lib/utils/rotatefile.h" -/** \file mainloop.h */ +/** \file mainloop.h + * The main loop for the TCP client interface and regular tasks such as resolving scanned data. + */ namespace ebusd { diff --git a/src/ebusd/mqtthandler.cpp b/src/ebusd/mqtthandler.cpp index bea23a4c..1b2aff9e 100644 --- a/src/ebusd/mqtthandler.cpp +++ b/src/ebusd/mqtthandler.cpp @@ -20,9 +20,9 @@ # include #endif -#include "mqtthandler.h" +#include "ebusd/mqtthandler.h" #include -#include "log.h" +#include "lib/utils/log.h" namespace ebusd { @@ -48,17 +48,17 @@ static const struct argp_option g_mqtt_argp_options[] = { }; static const char* g_host = "localhost"; //!< host name of MQTT broker [localhost] -static uint16_t g_port = 0; //!< optional port of MQTT broker, 0 to disable [0] -static const char* g_username = NULL; //!< optional user name for MQTT broker (no default) -static const char* g_password = NULL; //!< optional password for MQTT broker (no default) -static const char* g_topic = PACKAGE; //!< MQTT topic to use (prefix if without wildcards) [ebusd] +static uint16_t g_port = 0; //!< optional port of MQTT broker, 0 to disable [0] +static const char* g_username = NULL; //!< optional user name for MQTT broker (no default) +static const char* g_password = NULL; //!< optional password for MQTT broker (no default) +static const char* g_topic = PACKAGE; //!< MQTT topic to use (prefix if without wildcards) [ebusd] #if (LIBMOSQUITTO_MAJOR >= 1) -static const char* g_cafile = NULL; //!< CA file for TLS -static const char* g_capath = NULL; //!< CA path for TLS -static const char* g_certfile = NULL; //!< client certificate file for TLS -static const char* g_keyfile = NULL; //!< client key file for TLS -static const char* g_keypass = NULL; //!< client key file password for TLS +static const char* g_cafile = NULL; //!< CA file for TLS +static const char* g_capath = NULL; //!< CA path for TLS +static const char* g_certfile = NULL; //!< client certificate file for TLS +static const char* g_keyfile = NULL; //!< client key file for TLS +static const char* g_keypass = NULL; //!< client key file password for TLS #endif @@ -232,7 +232,7 @@ int on_keypassword(char *buf, int size, int rwflag, void *userdata) { if (!g_keypass) { return 0; } - int len = (int)strlen(g_keypass); + int len = static_cast(strlen(g_keypass)); if (len > size) { len = size; } @@ -251,8 +251,7 @@ void on_connect( } else { if (rc >= 1 && rc <= 3) { logOtherError("mqtt", "connection refused: %s", - rc == 1 ? "wrong protocol" : (rc == 2 ? "wrong username/password" : "broker down") - ); + rc == 1 ? "wrong protocol" : (rc == 2 ? "wrong username/password" : "broker down")); } else { logOtherError("mqtt", "connection refused: %d", rc); } @@ -303,7 +302,7 @@ MqttHandler::MqttHandler(BusHandler* busHandler, MessageMap* messages) if (mosquitto_lib_init() != MOSQ_ERR_SUCCESS) { logOtherError("mqtt", "unable to initialize"); } else { - signal(SIGPIPE, SIG_IGN); // needed before libmosquitto v. 1.1.3 + signal(SIGPIPE, SIG_IGN); // needed before libmosquitto v. 1.1.3 ostringstream clientId; clientId << PACKAGE_NAME << '_' << PACKAGE_VERSION << '_' << static_cast(getpid()); #if (LIBMOSQUITTO_MAJOR >= 1) @@ -357,7 +356,7 @@ MqttHandler::MqttHandler(BusHandler* busHandler, MessageMap* messages) mosquitto_destroy(m_mosquitto); m_mosquitto = NULL; } else { - m_connected = true; // assume success until connect_callback says otherwise + m_connected = true; // assume success until connect_callback says otherwise logOtherDebug("mqtt", "connection requested"); } } @@ -556,8 +555,7 @@ void MqttHandler::handleTraffic() { } if (ret == MOSQ_ERR_NO_CONN || ret == MOSQ_ERR_CONN_LOST || ret == MOSQ_ERR_CONN_REFUSED) { logOtherError("mqtt", "communication error: %s", ret == MOSQ_ERR_NO_CONN ? "not connected" - : (ret == MOSQ_ERR_CONN_LOST ? "connection lost" : "connection refused") - ); + : (ret == MOSQ_ERR_CONN_LOST ? "connection lost" : "connection refused")); m_connected = false; } else { logOtherError("mqtt", "communication error: %d", ret); diff --git a/src/ebusd/mqtthandler.h b/src/ebusd/mqtthandler.h index 1d4ef5f8..4621f52d 100644 --- a/src/ebusd/mqtthandler.h +++ b/src/ebusd/mqtthandler.h @@ -23,9 +23,9 @@ #include #include #include -#include "datahandler.h" -#include "bushandler.h" -#include "message.h" +#include "ebusd/datahandler.h" +#include "ebusd/bushandler.h" +#include "lib/ebus/message.h" /** @file mqtthandler.h * A data handler enabling MQTT support via mosquitto. diff --git a/src/ebusd/network.cpp b/src/ebusd/network.cpp index 322cc59d..58a25552 100644 --- a/src/ebusd/network.cpp +++ b/src/ebusd/network.cpp @@ -20,12 +20,12 @@ # include #endif -#include "network.h" +#include "ebusd/network.h" #ifdef HAVE_PPOLL # include #endif #include -#include "log.h" +#include "lib/utils/log.h" namespace ebusd { diff --git a/src/ebusd/network.h b/src/ebusd/network.h index 9628cefb..b638e114 100644 --- a/src/ebusd/network.h +++ b/src/ebusd/network.h @@ -23,12 +23,14 @@ #include #include #include -#include "tcpsocket.h" -#include "queue.h" -#include "notify.h" -#include "thread.h" +#include "lib/utils/tcpsocket.h" +#include "lib/utils/queue.h" +#include "lib/utils/notify.h" +#include "lib/utils/thread.h" -/** \file network.h */ +/** \file network.h + * The TCP and HTTP client request handling. + */ namespace ebusd { diff --git a/src/lib/ebus/Makefile.am b/src/lib/ebus/Makefile.am index a9050dcd..9a642d3b 100644 --- a/src/lib/ebus/Makefile.am +++ b/src/lib/ebus/Makefile.am @@ -1,4 +1,5 @@ -AM_CXXFLAGS = -Wconversion -Wno-unused-parameter +AM_CXXFLAGS = -I$(top_srcdir)/src \ + -Wconversion -Wno-unused-parameter noinst_LIBRARIES = libebus.a diff --git a/src/lib/ebus/contrib/Makefile.am b/src/lib/ebus/contrib/Makefile.am index dc027b95..0d4bac60 100644 --- a/src/lib/ebus/contrib/Makefile.am +++ b/src/lib/ebus/contrib/Makefile.am @@ -1,5 +1,5 @@ -AM_CXXFLAGS = -Wno-unused-parameter \ - -isystem$(top_srcdir)/src/lib/ebus +AM_CXXFLAGS = -I$(top_srcdir)/src \ + -Wno-unused-parameter noinst_LIBRARIES = libebuscontrib.a diff --git a/src/lib/ebus/contrib/contrib.cpp b/src/lib/ebus/contrib/contrib.cpp index b6669d8d..b79db155 100644 --- a/src/lib/ebus/contrib/contrib.cpp +++ b/src/lib/ebus/contrib/contrib.cpp @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#include "contrib.h" -#include "tem.h" +#include "lib/ebus/contrib/contrib.h" +#include "lib/ebus/contrib/tem.h" namespace ebusd { diff --git a/src/lib/ebus/contrib/tem.cpp b/src/lib/ebus/contrib/tem.cpp index 89c9e85c..7ccda70b 100644 --- a/src/lib/ebus/contrib/tem.cpp +++ b/src/lib/ebus/contrib/tem.cpp @@ -20,14 +20,14 @@ # include #endif -#include "tem.h" +#include "lib/ebus/contrib/tem.h" #include #include #include #include #include #include -#include "datatype.h" +#include "lib/ebus/datatype.h" namespace ebusd { diff --git a/src/lib/ebus/contrib/tem.h b/src/lib/ebus/contrib/tem.h index 8141df4d..f7a72a99 100644 --- a/src/lib/ebus/contrib/tem.h +++ b/src/lib/ebus/contrib/tem.h @@ -26,9 +26,9 @@ #include #include #include -#include "symbol.h" -#include "result.h" -#include "datatype.h" +#include "lib/ebus/symbol.h" +#include "lib/ebus/result.h" +#include "lib/ebus/datatype.h" /** @file tem.h * Contributed data types for TEM devices not part of regular releases. diff --git a/src/lib/ebus/contrib/test/Makefile.am b/src/lib/ebus/contrib/test/Makefile.am index de542f5f..5c1056af 100644 --- a/src/lib/ebus/contrib/test/Makefile.am +++ b/src/lib/ebus/contrib/test/Makefile.am @@ -1,5 +1,5 @@ -AM_CXXFLAGS = -Wno-unused-parameter \ - -isystem$(top_srcdir)/src/lib/ebus -isystem../ +AM_CXXFLAGS = -I$(top_srcdir)/src \ + -Wno-unused-parameter noinst_PROGRAMS = test_contrib diff --git a/src/lib/ebus/contrib/test/test_tem.cpp b/src/lib/ebus/contrib/test/test_tem.cpp index 179d1579..27217311 100644 --- a/src/lib/ebus/contrib/test/test_tem.cpp +++ b/src/lib/ebus/contrib/test/test_tem.cpp @@ -20,8 +20,8 @@ #include #include #include -#include "tem.h" -#include "data.h" +#include "lib/ebus/contrib/tem.h" +#include "lib/ebus/data.h" using namespace ebusd; diff --git a/src/lib/ebus/data.cpp b/src/lib/ebus/data.cpp index 4d62df56..01c74c05 100644 --- a/src/lib/ebus/data.cpp +++ b/src/lib/ebus/data.cpp @@ -20,7 +20,7 @@ # include #endif -#include "data.h" +#include "lib/ebus/data.h" #include #include #include diff --git a/src/lib/ebus/data.h b/src/lib/ebus/data.h index 38dad44a..fe216a0a 100644 --- a/src/lib/ebus/data.h +++ b/src/lib/ebus/data.h @@ -25,10 +25,10 @@ #include #include #include -#include "symbol.h" -#include "result.h" -#include "filereader.h" -#include "datatype.h" +#include "lib/ebus/symbol.h" +#include "lib/ebus/result.h" +#include "lib/ebus/filereader.h" +#include "lib/ebus/datatype.h" /** @file data.h * Classes related to defining fields based on data types in symbols on the diff --git a/src/lib/ebus/datatype.cpp b/src/lib/ebus/datatype.cpp index 86d2004e..647327d4 100644 --- a/src/lib/ebus/datatype.cpp +++ b/src/lib/ebus/datatype.cpp @@ -20,7 +20,7 @@ # include #endif -#include "datatype.h" +#include "lib/ebus/datatype.h" #include #include #include @@ -28,7 +28,7 @@ #include #include #ifdef HAVE_CONTRIB -# include "contrib/contrib.h" +# include "lib/ebus/contrib/contrib.h" #endif namespace ebusd { diff --git a/src/lib/ebus/datatype.h b/src/lib/ebus/datatype.h index 487249ce..1c3d167c 100644 --- a/src/lib/ebus/datatype.h +++ b/src/lib/ebus/datatype.h @@ -27,9 +27,9 @@ #include #include #include -#include "symbol.h" -#include "result.h" -#include "filereader.h" +#include "lib/ebus/symbol.h" +#include "lib/ebus/result.h" +#include "lib/ebus/filereader.h" /** @file datatype.h * Classes, functions, and constants related to decoding/encoding of symbols @@ -271,7 +271,7 @@ class DataType { const uint16_t m_flags; /** the replacement value (fill-up value for @a StringDataType, no replacement if equal to - * @a NumberDataType#minValue). */ + * @a NumberDataType#m_minValue). */ const unsigned int m_replacement; }; diff --git a/src/lib/ebus/device.cpp b/src/lib/ebus/device.cpp index 09bbcabd..90c9abbc 100644 --- a/src/lib/ebus/device.cpp +++ b/src/lib/ebus/device.cpp @@ -20,7 +20,7 @@ # include #endif -#include "device.h" +#include "lib/ebus/device.h" #include #include #include @@ -34,7 +34,7 @@ #include #include #include -#include "data.h" +#include "lib/ebus/data.h" namespace ebusd { diff --git a/src/lib/ebus/device.h b/src/lib/ebus/device.h index b2b818cf..429bc4dd 100644 --- a/src/lib/ebus/device.h +++ b/src/lib/ebus/device.h @@ -25,7 +25,7 @@ #include #include #include -#include "result.h" +#include "lib/ebus/result.h" /** @file device.h * Classes providing access to the eBUS. diff --git a/src/lib/ebus/filereader.h b/src/lib/ebus/filereader.h index f2558b25..cc9f7ad5 100644 --- a/src/lib/ebus/filereader.h +++ b/src/lib/ebus/filereader.h @@ -26,8 +26,8 @@ #include #include #include -#include "symbol.h" -#include "result.h" +#include "lib/ebus/symbol.h" +#include "lib/ebus/result.h" /** @file filereader.h * Helper class and constants for reading configuration files. diff --git a/src/lib/ebus/message.cpp b/src/lib/ebus/message.cpp index 6fded6db..d1df9fc0 100644 --- a/src/lib/ebus/message.cpp +++ b/src/lib/ebus/message.cpp @@ -16,16 +16,16 @@ * along with this program. If not, see . */ -#include "message.h" +#include "lib/ebus/message.h" #include #include #include #include #include #include -#include "data.h" -#include "result.h" -#include "symbol.h" +#include "lib/ebus/data.h" +#include "lib/ebus/result.h" +#include "lib/ebus/symbol.h" namespace ebusd { @@ -659,7 +659,8 @@ result_t Message::storeLastData(SymbolString& master, SymbolString& slave) { result_t Message::storeLastData(const PartType partType, SymbolString& data, unsigned char index) { if (data.size() > 0 - && (m_isWrite || this->m_dstAddress == BROADCAST || partType == pt_slaveData || (partType == pt_masterData && isMaster(this->m_dstAddress)))) { + && (m_isWrite || this->m_dstAddress == BROADCAST || partType == pt_slaveData + || (partType == pt_masterData && isMaster(this->m_dstAddress)))) { time(&m_lastUpdateTime); } if (partType == pt_masterData) { diff --git a/src/lib/ebus/message.h b/src/lib/ebus/message.h index 17eb9f6d..fa693d23 100644 --- a/src/lib/ebus/message.h +++ b/src/lib/ebus/message.h @@ -26,9 +26,9 @@ #include #include #include -#include "data.h" -#include "result.h" -#include "symbol.h" +#include "lib/ebus/data.h" +#include "lib/ebus/result.h" +#include "lib/ebus/symbol.h" /** @file message.h * Classes and functions for decoding and encoding of complete messages on the diff --git a/src/lib/ebus/result.cpp b/src/lib/ebus/result.cpp index c0e8d1a9..c8a3cba3 100644 --- a/src/lib/ebus/result.cpp +++ b/src/lib/ebus/result.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "result.h" +#include "lib/ebus/result.h" #include namespace ebusd { diff --git a/src/lib/ebus/symbol.cpp b/src/lib/ebus/symbol.cpp index 26de852e..b7e0b9aa 100644 --- a/src/lib/ebus/symbol.cpp +++ b/src/lib/ebus/symbol.cpp @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -#include "symbol.h" +#include "lib/ebus/symbol.h" #include #include #include #include -#include "result.h" +#include "lib/ebus/result.h" namespace ebusd { diff --git a/src/lib/ebus/symbol.h b/src/lib/ebus/symbol.h index b2bbfaff..0eadcd23 100644 --- a/src/lib/ebus/symbol.h +++ b/src/lib/ebus/symbol.h @@ -25,7 +25,7 @@ #include #include #include -#include "result.h" +#include "lib/ebus/result.h" /** @file symbol.h * Classes, functions, and constants related to symbols on the eBUS. diff --git a/src/lib/ebus/test/Makefile.am b/src/lib/ebus/test/Makefile.am index 07307770..2406c02f 100644 --- a/src/lib/ebus/test/Makefile.am +++ b/src/lib/ebus/test/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = -isystem$(top_srcdir)/src/lib/ebus +AM_CXXFLAGS = -I$(top_srcdir)/src noinst_PROGRAMS = test_filereader \ test_device \ diff --git a/src/lib/ebus/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp index e679ae78..d9fbe216 100644 --- a/src/lib/ebus/test/test_data.cpp +++ b/src/lib/ebus/test/test_data.cpp @@ -20,7 +20,7 @@ #include #include #include -#include "data.h" +#include "lib/ebus/data.h" using namespace ebusd; diff --git a/src/lib/ebus/test/test_device.cpp b/src/lib/ebus/test/test_device.cpp index 844c4f01..329d7713 100644 --- a/src/lib/ebus/test/test_device.cpp +++ b/src/lib/ebus/test/test_device.cpp @@ -18,7 +18,7 @@ #include #include -#include "device.h" +#include "lib/ebus/device.h" using namespace std; using namespace ebusd; diff --git a/src/lib/ebus/test/test_filereader.cpp b/src/lib/ebus/test/test_filereader.cpp index 6193d868..91b14802 100644 --- a/src/lib/ebus/test/test_filereader.cpp +++ b/src/lib/ebus/test/test_filereader.cpp @@ -20,7 +20,7 @@ #include #include #include -#include "filereader.h" +#include "lib/ebus/filereader.h" using namespace std; using namespace ebusd; diff --git a/src/lib/ebus/test/test_message.cpp b/src/lib/ebus/test/test_message.cpp index acd9f888..eeec7c52 100644 --- a/src/lib/ebus/test/test_message.cpp +++ b/src/lib/ebus/test/test_message.cpp @@ -22,7 +22,7 @@ #include #include #include -#include "message.h" +#include "lib/ebus/message.h" using namespace ebusd; diff --git a/src/lib/ebus/test/test_symbol.cpp b/src/lib/ebus/test/test_symbol.cpp index fd6c917f..0ee67f63 100644 --- a/src/lib/ebus/test/test_symbol.cpp +++ b/src/lib/ebus/test/test_symbol.cpp @@ -19,7 +19,7 @@ #include #include #include -#include "symbol.h" +#include "lib/ebus/symbol.h" using namespace std; using namespace ebusd; diff --git a/src/lib/utils/Makefile.am b/src/lib/utils/Makefile.am index 2a6641a3..93f27feb 100644 --- a/src/lib/utils/Makefile.am +++ b/src/lib/utils/Makefile.am @@ -1,4 +1,5 @@ -AM_CXXFLAGS = -Wconversion +AM_CXXFLAGS = -I$(top_srcdir)/src \ + -Wconversion noinst_LIBRARIES = libutils.a diff --git a/src/lib/utils/clock.cpp b/src/lib/utils/clock.cpp index e3672156..15001dfe 100644 --- a/src/lib/utils/clock.cpp +++ b/src/lib/utils/clock.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "clock.h" +#include "lib/utils/clock.h" #ifdef __MACH__ # include # include diff --git a/src/lib/utils/log.cpp b/src/lib/utils/log.cpp index bf15dc44..4937dfd2 100644 --- a/src/lib/utils/log.cpp +++ b/src/lib/utils/log.cpp @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#include "log.h" +#include "lib/utils/log.h" #include #include #include #include #include #include -#include "clock.h" +#include "lib/utils/clock.h" /** the name of each @a LogFacility. */ static const char *facilityNames[] = { diff --git a/src/lib/utils/queue.h b/src/lib/utils/queue.h index 885cf3df..f5a926e2 100644 --- a/src/lib/utils/queue.h +++ b/src/lib/utils/queue.h @@ -22,7 +22,7 @@ #include #include #include -#include "clock.h" +#include "lib/utils/clock.h" /** \file queue.h */ diff --git a/src/lib/utils/rotatefile.cpp b/src/lib/utils/rotatefile.cpp index 0b312f82..15c47847 100644 --- a/src/lib/utils/rotatefile.cpp +++ b/src/lib/utils/rotatefile.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "rotatefile.h" +#include "lib/utils/rotatefile.h" #include #include #include @@ -25,7 +25,7 @@ #include #include #include -#include "clock.h" +#include "lib/utils/clock.h" using std::streamsize; diff --git a/src/lib/utils/tcpsocket.cpp b/src/lib/utils/tcpsocket.cpp index ca3d98bc..43b18e38 100644 --- a/src/lib/utils/tcpsocket.cpp +++ b/src/lib/utils/tcpsocket.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "tcpsocket.h" +#include "lib/utils/tcpsocket.h" #include #include #include diff --git a/src/lib/utils/thread.cpp b/src/lib/utils/thread.cpp index 2967069c..0a2f73f9 100644 --- a/src/lib/utils/thread.cpp +++ b/src/lib/utils/thread.cpp @@ -20,8 +20,8 @@ # include #endif -#include "thread.h" -#include "clock.h" +#include "lib/utils/thread.h" +#include "lib/utils/clock.h" void* Thread::runThread(void* arg) { reinterpret_cast(arg)->enter(); diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index 1d14bde5..c9dc337e 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -1,5 +1,4 @@ -AM_CXXFLAGS = -isystem$(top_srcdir)/src/lib/utils \ - -isystem$(top_srcdir)/src/lib/ebus +AM_CXXFLAGS = -I$(top_srcdir)/src bin_PROGRAMS = ebusctl \ ebusfeed diff --git a/src/tools/ebusctl.cpp b/src/tools/ebusctl.cpp index b2de666d..570afef1 100644 --- a/src/tools/ebusctl.cpp +++ b/src/tools/ebusctl.cpp @@ -30,7 +30,7 @@ #include #include #include -#include "tcpsocket.h" +#include "lib/utils/tcpsocket.h" using std::ostringstream; using std::cin; diff --git a/src/tools/ebusfeed.cpp b/src/tools/ebusfeed.cpp index f18e75fa..3132d420 100644 --- a/src/tools/ebusfeed.cpp +++ b/src/tools/ebusfeed.cpp @@ -27,8 +27,8 @@ #include #include #include -#include "device.h" -#include "result.h" +#include "lib/ebus/device.h" +#include "lib/ebus/result.h" using std::hex; using std::fstream;