This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/685-properties-json-serialization in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/685-properties-json-serialization by this push: new c46a483b gh-685: Some whitespace corrections c46a483b is described below commit c46a483bc8031edc14e11739a8bec5aa7043e4ee Author: Pepijn Noltes <pnol...@apache.org> AuthorDate: Mon Apr 15 23:25:05 2024 +0200 gh-685: Some whitespace corrections --- conanfile.py | 2 +- libs/error_injector/jansson/src/jansson_ei.cc | 2 +- libs/utils/error_injector/celix_version/src/celix_version_ei.cc | 2 +- libs/utils/gtest/src/PropertiesEncodingTestSuite.cc | 2 +- libs/utils/include/celix_utils.h | 9 ++++----- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/conanfile.py b/conanfile.py index d8b46d01..dbf956ba 100644 --- a/conanfile.py +++ b/conanfile.py @@ -309,7 +309,7 @@ class CelixConan(ConanFile): self.options['openssl'].shared = True if self.options.build_celix_dfi: self.options['libffi'].shared = True - if self.options.build_utils or self.options.build_celix_dfi or self.options.build_celix_etcdlib: + if self.options.build_utils or self.options.build_celix_dfi or self.options.build_celix_etcdlib: self.options['jansson'].shared = True def requirements(self): diff --git a/libs/error_injector/jansson/src/jansson_ei.cc b/libs/error_injector/jansson/src/jansson_ei.cc index 1d820629..515d4567 100644 --- a/libs/error_injector/jansson/src/jansson_ei.cc +++ b/libs/error_injector/jansson/src/jansson_ei.cc @@ -106,4 +106,4 @@ json_t* __wrap_json_sprintf(const char* fmt, ...) { return obj; } -} \ No newline at end of file +} diff --git a/libs/utils/error_injector/celix_version/src/celix_version_ei.cc b/libs/utils/error_injector/celix_version/src/celix_version_ei.cc index ddcdf9f8..b09339cd 100644 --- a/libs/utils/error_injector/celix_version/src/celix_version_ei.cc +++ b/libs/utils/error_injector/celix_version/src/celix_version_ei.cc @@ -48,4 +48,4 @@ char* __wrap_celix_version_toString(const celix_version_t* version) { return __real_celix_version_toString(version); } -} \ No newline at end of file +} diff --git a/libs/utils/gtest/src/PropertiesEncodingTestSuite.cc b/libs/utils/gtest/src/PropertiesEncodingTestSuite.cc index 3e03b77e..4232131b 100644 --- a/libs/utils/gtest/src/PropertiesEncodingTestSuite.cc +++ b/libs/utils/gtest/src/PropertiesEncodingTestSuite.cc @@ -914,4 +914,4 @@ TEST_F(PropertiesSerializationTestSuite, SaveAndLoadFlatProperties) { // And the loaded properties are equal to the original properties EXPECT_TRUE(celix_properties_equals(props, loadedProps)); -} \ No newline at end of file +} diff --git a/libs/utils/include/celix_utils.h b/libs/utils/include/celix_utils.h index 6f58f2b7..19a4fd94 100644 --- a/libs/utils/include/celix_utils.h +++ b/libs/utils/include/celix_utils.h @@ -97,9 +97,7 @@ CELIX_UTILS_EXPORT void celix_utils_freeStringIfNotEqual(const char* buffer, cha * @brief Guard for a string created with celix_utils_writeOrCreateString, celix_utils_writeOrCreateVString. * * Can be used with celix_auto() to automatically and correctly free the string. - * If the string is pointing to the buffer, the string should be freed, otherwise the string should be freed. - * - * + * If the string is pointing to the buffer, the string should not be freed, otherwise the string should be freed. */ typedef struct celix_utils_string_guard { const char* buffer; @@ -107,7 +105,8 @@ typedef struct celix_utils_string_guard { } celix_utils_string_guard_t; /** - * @brief Initialize a guard for a string created with celix_utils_writeOrCreateString, celix_utils_writeOrCreateVString. + * @brief Initialize a guard for a string created with celix_utils_writeOrCreateString or + * celix_utils_writeOrCreateVString. * * De-initialize with celix_utils_stringGuard_deinit(). * @@ -115,7 +114,7 @@ typedef struct celix_utils_string_guard { * This is intended to be used with celix_auto(). * * * Example: -* ``` + * ``` * const char* possibleLongString = ... * char buffer[64]; * char* str = celix_utils_writeOrCreateString(buffer, sizeof(buffer), "Hello %s", possibleLongString);