From 71285aec9dc9d52dbba69be6a1e6bab1b4a51cd5 Mon Sep 17 00:00:00 2001 From: Daniel <d.hornung@indiscale.com> Date: Fri, 30 Jul 2021 17:59:58 +0200 Subject: [PATCH] STY: Formatting. --- include/caosdb/entity.h | 4 ++-- include/caosdb/logging.h | 15 ++++++++------- include/caosdb/message_code.h | 5 +++-- include/caosdb/transaction_status.h | 5 +++-- include/caosdb/utility.h | 3 +-- src/ccaosdb.cpp | 3 +-- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/include/caosdb/entity.h b/include/caosdb/entity.h index e4f628e..09d96f0 100644 --- a/include/caosdb/entity.h +++ b/include/caosdb/entity.h @@ -114,8 +114,8 @@ private: /** * Messages convey information about the state and result of transactions. * - * A Message object can be thought of as kinf of a generalized error object in other frameworks. - * Please have a look at MessageCodes for more details. + * A Message object can be thought of as kinf of a generalized error object in + * other frameworks. Please have a look at MessageCodes for more details. */ class Message { public: diff --git a/include/caosdb/logging.h b/include/caosdb/logging.h index d111f78..fcebc6d 100644 --- a/include/caosdb/logging.h +++ b/include/caosdb/logging.h @@ -82,16 +82,17 @@ auto initialize_logging(const LoggingConfiguration &configuration) -> void; * * Typical inheriting configurations exist for console, files and syslog. * - * When a SinkConfiguration is created from a configuration, the sink configuration must contain a - * \p destination key which matches one of the keywords for implemented sinks. At the moment of - * writing this documentation, valid destinations are: + * When a SinkConfiguration is created from a configuration, the sink + * configuration must contain a \p destination key which matches one of the + * keywords for implemented sinks. At the moment of writing this documentation, + * valid destinations are: * * \li \p file * \li \p console * \li \p syslog * - * A \p level keyword sets the logging level, if it exists at the sink or logging level of the - * configuration. + * A \p level keyword sets the logging level, if it exists at the sink or + * logging level of the configuration. */ class SinkConfiguration : public LevelConfiguration { public: @@ -131,8 +132,8 @@ private: /** * The file name is the destination, the directory can be set separately. * - * If there is a `directory` key in the configuration, that will be used as a default, otherwise it - * is the current directory. + * If there is a `directory` key in the configuration, that will be used as a + * default, otherwise it is the current directory. */ class FileSinkConfiguration : public SinkConfiguration { public: diff --git a/include/caosdb/message_code.h b/include/caosdb/message_code.h index ca08edf..34a7319 100644 --- a/include/caosdb/message_code.h +++ b/include/caosdb/message_code.h @@ -31,8 +31,9 @@ * API. Messages (and their codes) represent the state of the entities in a * transaction or the server. * - * For a specification of the message codes, look at the protobuf documentation. The sources and - * documentation can be found at https://gitlab.indiscale.com/caosdb/src/caosdb-proto. + * For a specification of the message codes, look at the protobuf documentation. + * The sources and documentation can be found at + * https://gitlab.indiscale.com/caosdb/src/caosdb-proto. */ namespace caosdb::entity { diff --git a/include/caosdb/transaction_status.h b/include/caosdb/transaction_status.h index 32465c6..6c5b7a6 100644 --- a/include/caosdb/transaction_status.h +++ b/include/caosdb/transaction_status.h @@ -26,8 +26,9 @@ * TransactionStatus indicates the current status of a transaction and, when it * has already terminated, whether the transaction has been successful or not. * - * A status code of 0 denotes a generic success state, positive values indicate errors, and negative - * values indicate other states, such as different stages of a transaction in process. + * A status code of 0 denotes a generic success state, positive values indicate + * errors, and negative values indicate other states, such as different stages + * of a transaction in process. */ #include "caosdb/status_code.h" diff --git a/include/caosdb/utility.h b/include/caosdb/utility.h index fbfc5c1..30e2174 100644 --- a/include/caosdb/utility.h +++ b/include/caosdb/utility.h @@ -53,8 +53,7 @@ inline auto load_string_file(const path &path) -> std::string { /** * @brief Return the environment variable KEY, or FALLBACK if it does not exist. */ -inline auto get_env_var(const char *key, const char *fallback) -> const - char * { +inline auto get_env_var(const char *key, const char *fallback) -> const char * { const char *val = getenv(key); if (val == nullptr) { return fallback; diff --git a/src/ccaosdb.cpp b/src/ccaosdb.cpp index 4ed9188..5f89af1 100644 --- a/src/ccaosdb.cpp +++ b/src/ccaosdb.cpp @@ -56,8 +56,7 @@ const char *caosdb_constants_COMPATIBLE_SERVER_VERSION_PRE_RELEASE() { return caosdb::COMPATIBLE_SERVER_VERSION_PRE_RELEASE; } -const char *caosdb_utility_get_env_var(const char *name, - const char *fallback) { +const char *caosdb_utility_get_env_var(const char *name, const char *fallback) { return caosdb::utility::get_env_var(name, fallback); } -- GitLab