Cleanup

robotology · Jan 14, 2022 · 09e0423 · 09e0423
1 parent 853b25c
commit 09e0423
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -1,5 +1,5 @@
 ---
-Checks:          'clang-diagnostic-*,clang-analyzer-*,-*,bugprone-*,-bugprone-macro-parentheses,-bugprone-misplaced-widening-cast,google-readability-casting,misc-*,-misc-incorrect-roundings,-misc-macro-parentheses,-misc-misplaced-widening-cast,-misc-static-assert,modernize-*,-modernize-deprecated-headers,-modernize-pass-by-value,-modernize-raw-string-literal,-modernize-return-braced-init-list,-modernize-use-auto,-modernize-use-default-member-init,-modernize-use-emplace,-modernize-use-equals-default,-modernize-use-equals-delete,-modernize-use-noexcept,-modernize-use-transparent-functors,-modernize-use-using,performance-*,-performance-inefficient-string-concatenation,-performance-inefficient-vector-operation,readability-*,-readability-function-size,-readability-identifier-naming,-readability-implicit-bool-cast,-readability-implicit-bool-conversion,-readability-inconsistent-declaration-parameter-name,-readability-named-parameter,-readability-redundant-declaration,-readability-redundant-member-init,-readability-simplify-boolean-expr,-modernize-use-trailing-return-type,-readability-avoid-const-params-in-decls,-modernize-avoid-c-arrays,-misc-non-private-member-variables-in-classes,-readability-convert-member-functions-to-static'
+Checks:          'clang-diagnostic-*,clang-analyzer-*,-*,bugprone-*,-bugprone-macro-parentheses,-bugprone-misplaced-widening-cast,google-readability-casting,misc-*,-misc-incorrect-roundings,-misc-macro-parentheses,-misc-misplaced-widening-cast,-misc-static-assert,modernize-*,-modernize-deprecated-headers,-modernize-pass-by-value,-modernize-raw-string-literal,-modernize-return-braced-init-list,-modernize-use-auto,-modernize-use-default-member-init,-modernize-use-emplace,-modernize-use-equals-default,-modernize-use-equals-delete,-modernize-use-noexcept,-modernize-use-transparent-functors,-modernize-use-using,performance-*,-performance-inefficient-string-concatenation,-performance-inefficient-vector-operation,readability-*,-readability-function-size,-readability-identifier-naming,-readability-implicit-bool-cast,-readability-implicit-bool-conversion,-readability-inconsistent-declaration-parameter-name,-readability-named-parameter,-readability-redundant-declaration,-readability-redundant-member-init,-readability-simplify-boolean-expr,-modernize-use-trailing-return-type,-readability-avoid-const-params-in-decls,-modernize-avoid-c-arrays,-misc-non-private-member-variables-in-classes,-readability-convert-member-functions-to-static,-modernize-use-nodiscard'
 WarningsAsErrors: ''
 AnalyzeTemporaryDtors: false
 HeaderFilterRegex: '.*'

diff --git a/src/libYARP_os/src/yarp/os/Bottle.h b/src/libYARP_os/src/yarp/os/Bottle.h
@@ -28,10 +28,10 @@
 #define BOTTLE_TAG_LIST 256        // 0000 0001 0000 0000
 #define BOTTLE_TAG_DICT 512        // 0000 0010 0000 0000
 
-YARP_DEPRECATED_MSG("Use BOTTLE_TAG_INT32 instead") // Since YARP 3.5.0
+YARP_DEPRECATED_MSG("Use BOTTLE_TAG_FLOAT64 instead") // Since YARP 3.5.0
 constexpr std::int32_t BOTTLE_TAG_DOUBLE = BOTTLE_TAG_FLOAT64;
 
-YARP_DEPRECATED_MSG("Use BOTTLE_TAG_FLOAT64 instead") // Since YARP 3.5.0
+YARP_DEPRECATED_MSG("Use BOTTLE_TAG_INT32 instead") // Since YARP 3.5.0
 constexpr std::int32_t BOTTLE_TAG_INT = BOTTLE_TAG_INT32;
 
 YARP_DEPRECATED_MSG("Use BOTTLE_TAG_VOCAB32 instead") // Since YARP 3.5.0

diff --git a/src/libYARP_os/src/yarp/os/idl/WireWriter.cpp b/src/libYARP_os/src/yarp/os/idl/WireWriter.cpp
@@ -184,20 +184,20 @@ bool WireWriter::writeTag(const char* tag, int split, int len) const
     return true;
 }
 
-bool WireWriter::writeString(const std::string& tag) const
+bool WireWriter::writeString(const std::string& str) const
 {
     writer.appendInt32(BOTTLE_TAG_STRING);
-    // WARNING tag.length() value is not checked here
-    writer.appendString(tag);
+    // WARNING str.length() value is not checked here
+    writer.appendString(str);
     return !writer.isError();
 }
 
-bool WireWriter::writeBinary(const std::string& tag) const
+bool WireWriter::writeBinary(const std::string& blob) const
 {
     writer.appendInt32(BOTTLE_TAG_BLOB);
-    // WARNING tag.length() value is not checked here
-    writer.appendInt32(static_cast<int>(tag.length()));
-    writer.appendBlock(tag.c_str(), tag.length());
+    // WARNING blob.length() value is not checked here
+    writer.appendInt32(static_cast<int>(blob.length()));
+    writer.appendBlock(blob.c_str(), blob.length());
     return !writer.isError();
 }
 
@@ -241,6 +241,7 @@ bool WireWriter::writeMapBegin(int tag, int tag2, std::uint32_t len) const
     YARP_UNUSED(tag);
     YARP_UNUSED(tag2);
     writer.appendInt32(BOTTLE_TAG_LIST);
+    // FIXME check len
     writer.appendInt32(static_cast<int>(len));
     return !writer.isError();
 }

diff --git a/src/libYARP_os/src/yarp/os/idl/WireWriter.h b/src/libYARP_os/src/yarp/os/idl/WireWriter.h
@@ -86,9 +86,9 @@ class YARP_os_API WireWriter
 
     bool writeTag(const char* tag, int split, int len) const;
 
-    bool writeString(const std::string& tag) const;
+    bool writeString(const std::string& str) const;
 
-    bool writeBinary(const std::string& tag) const;
+    bool writeBinary(const std::string& blob) const;
 
     bool writeListHeader(int len) const;
 

diff --git a/tests/yarpidl_thrift/demo/main.cpp b/tests/yarpidl_thrift/demo/main.cpp
@@ -742,7 +742,6 @@ TEST_CASE("IdlThriftTest", "[yarp::idl::thrift]")
 
     SECTION("test general help")
     {
-
         Server server;
         Bottle bot("[help]");
         DummyConnector con;