[core] Adapted c-api of monitoring in the way to remain c-return value compliant #1862

hannemn · 2024-12-16T14:05:46Z

This is a follow-up on #1859

…moved obsolete ecal_clang functions

github-actions

clang-tidy made some suggestions

github-actions · 2024-12-16T14:17:16Z

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp

@@ -32,23 +32,23 @@ extern "C"
 {
  ECALC_API int eCAL_Monitoring_SetExclFilter(const char* filter_)
  {
-    return(eCAL::Monitoring::SetExclFilter(std::string(filter_)));
+    return(!eCAL::Monitoring::SetExclFilter(std::string(filter_)));


warning: implicit conversion 'bool' -> 'int' [readability-implicit-bool-conversion]

Suggested change

return(!eCAL::Monitoring::SetExclFilter(std::string(filter_)));

returnstatic_cast<int>(!eCAL::Monitoring::SetExclFilter(std::string(filter_)));

github-actions · 2024-12-16T14:17:17Z

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp

@@ -32,23 +32,23 @@
 {
  ECALC_API int eCAL_Monitoring_SetExclFilter(const char* filter_)
  {
-    return(eCAL::Monitoring::SetExclFilter(std::string(filter_)));
+    return(!eCAL::Monitoring::SetExclFilter(std::string(filter_)));


warning: no header providing "eCAL::Monitoring::SetExclFilter" is directly included [misc-include-cleaner]

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp:27:

- #include "ecal_common_cimpl.h" + #include "ecal/ecal_monitoring.h" + #include "ecal_common_cimpl.h"

github-actions · 2024-12-16T14:17:17Z

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp

@@ -32,23 +32,23 @@
 {
  ECALC_API int eCAL_Monitoring_SetExclFilter(const char* filter_)
  {
-    return(eCAL::Monitoring::SetExclFilter(std::string(filter_)));
+    return(!eCAL::Monitoring::SetExclFilter(std::string(filter_)));


warning: no header providing "std::string" is directly included [misc-include-cleaner]

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp:26:

+ #include <string>

github-actions · 2024-12-16T14:17:17Z

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp

  }

  ECALC_API int eCAL_Monitoring_SetInclFilter(const char* filter_)
  {
-    return(eCAL::Monitoring::SetInclFilter(std::string(filter_)));
+    return(!eCAL::Monitoring::SetInclFilter(std::string(filter_)));


warning: implicit conversion 'bool' -> 'int' [readability-implicit-bool-conversion]

Suggested change

return(!eCAL::Monitoring::SetInclFilter(std::string(filter_)));

returnstatic_cast<int>(!eCAL::Monitoring::SetInclFilter(std::string(filter_)));

github-actions · 2024-12-16T14:17:17Z

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp

  }

  ECALC_API int eCAL_Monitoring_SetInclFilter(const char* filter_)
  {
-    return(eCAL::Monitoring::SetInclFilter(std::string(filter_)));
+    return(!eCAL::Monitoring::SetInclFilter(std::string(filter_)));


warning: no header providing "eCAL::Monitoring::SetInclFilter" is directly included [misc-include-cleaner]

return(!eCAL::Monitoring::SetInclFilter(std::string(filter_))); ^

github-actions · 2024-12-16T14:17:17Z

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp

  }

  ECALC_API int eCAL_Monitoring_SetFilterState(int state_)
  {
-    return(eCAL::Monitoring::SetFilterState(state_ != 0));
+    return(!eCAL::Monitoring::SetFilterState(state_ != 0));


warning: implicit conversion 'bool' -> 'int' [readability-implicit-bool-conversion]

Suggested change

return(!eCAL::Monitoring::SetFilterState(state_ != 0));

returnstatic_cast<int>(!eCAL::Monitoring::SetFilterState(state_ != 0));

github-actions · 2024-12-16T14:17:17Z

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp

  }

  ECALC_API int eCAL_Monitoring_SetFilterState(int state_)
  {
-    return(eCAL::Monitoring::SetFilterState(state_ != 0));
+    return(!eCAL::Monitoring::SetFilterState(state_ != 0));


warning: no header providing "eCAL::Monitoring::SetFilterState" is directly included [misc-include-cleaner]

return(!eCAL::Monitoring::SetFilterState(state_ != 0)); ^

github-actions · 2024-12-16T14:17:17Z

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp

  }

  ECALC_API int eCAL_Monitoring_GetMonitoring(void* buf_, int buf_len_)
  {
    std::string buf;
-    if (eCAL::Monitoring::GetMonitoring(buf) != 0)
+    if (eCAL::Monitoring::GetMonitoring(buf))


warning: no header providing "eCAL::Monitoring::GetMonitoring" is directly included [misc-include-cleaner]

if (eCAL::Monitoring::GetMonitoring(buf)) ^

github-actions · 2024-12-16T14:17:17Z

lang/python/core/src/ecal_wrap.cxx

@@ -1055,7 +1055,7 @@ PyObject* mon_monitoring(PyObject* /*self*/, PyObject* /*args*/)
  PyObject* retDict = PyDict_New();

  eCAL::Monitoring::SMonitoring monitoring;
-  if (eCAL::Monitoring::GetMonitoring(monitoring) != 0)
+  if (eCAL::Monitoring::GetMonitoring(monitoring))


warning: no header providing "eCAL::Monitoring::GetMonitoring" is directly included [misc-include-cleaner]

if (eCAL::Monitoring::GetMonitoring(monitoring)) ^

github-actions

clang-tidy made some suggestions

github-actions · 2024-12-16T14:52:34Z

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp

@@ -32,23 +32,23 @@ extern "C"
 {
  ECALC_API int eCAL_Monitoring_SetExclFilter(const char* filter_)
  {
-    return(eCAL::Monitoring::SetExclFilter(std::string(filter_)));
+    return(static_cast<int>(!eCAL::Monitoring::SetExclFilter(std::string(filter_))));


warning: no header providing "eCAL::Monitoring::SetExclFilter" is directly included [misc-include-cleaner]

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp:27:

- #include "ecal_common_cimpl.h" + #include "ecal/ecal_monitoring.h" + #include "ecal_common_cimpl.h"

github-actions · 2024-12-16T14:52:34Z

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp

@@ -32,23 +32,23 @@
 {
  ECALC_API int eCAL_Monitoring_SetExclFilter(const char* filter_)
  {
-    return(eCAL::Monitoring::SetExclFilter(std::string(filter_)));
+    return(static_cast<int>(!eCAL::Monitoring::SetExclFilter(std::string(filter_))));


warning: no header providing "std::string" is directly included [misc-include-cleaner]

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp:26:

+ #include <string>

github-actions · 2024-12-16T14:52:34Z

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp

  }

  ECALC_API int eCAL_Monitoring_SetInclFilter(const char* filter_)
  {
-    return(eCAL::Monitoring::SetInclFilter(std::string(filter_)));
+    return(static_cast<int>(!eCAL::Monitoring::SetInclFilter(std::string(filter_))));


warning: no header providing "eCAL::Monitoring::SetInclFilter" is directly included [misc-include-cleaner]

return(static_cast<int>(!eCAL::Monitoring::SetInclFilter(std::string(filter_)))); ^

github-actions · 2024-12-16T14:52:34Z

ecal/core/src/cimpl/ecal_monitoring_cimpl.cpp

  }

  ECALC_API int eCAL_Monitoring_SetFilterState(int state_)
  {
-    return(eCAL::Monitoring::SetFilterState(state_ != 0));
+    return(static_cast<int>(!eCAL::Monitoring::SetFilterState(state_ != 0)));


warning: no header providing "eCAL::Monitoring::SetFilterState" is directly included [misc-include-cleaner]

return(static_cast<int>(!eCAL::Monitoring::SetFilterState(state_ != 0))); ^

Peguen

🍀

Adapted c-api of monitoring to remain c-return value compliant and re…

00fcce1

…moved obsolete ecal_clang functions

hannemn added the cherry-pick-to-NONE Don't cherry-pick these changes label Dec 16, 2024

hannemn requested review from rex-schilasky and Peguen December 16, 2024 14:09

github-actions bot reviewed Dec 16, 2024

View reviewed changes

Added explicit conversions from bool to int

647cd81

github-actions bot reviewed Dec 16, 2024

View reviewed changes

Peguen approved these changes Dec 16, 2024

View reviewed changes

hannemn merged commit 7039426 into master Dec 16, 2024
20 checks passed

hannemn deleted the hotfix/monitoring-c-api branch December 18, 2024 18:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[core] Adapted c-api of monitoring in the way to remain c-return value compliant #1862

[core] Adapted c-api of monitoring in the way to remain c-return value compliant #1862

hannemn commented Dec 16, 2024

github-actions bot left a comment

github-actions bot Dec 16, 2024

github-actions bot Dec 16, 2024

github-actions bot Dec 16, 2024

github-actions bot Dec 16, 2024

github-actions bot Dec 16, 2024

github-actions bot Dec 16, 2024

github-actions bot Dec 16, 2024

github-actions bot Dec 16, 2024

github-actions bot Dec 16, 2024

github-actions bot left a comment

github-actions bot Dec 16, 2024

github-actions bot Dec 16, 2024

github-actions bot Dec 16, 2024

github-actions bot Dec 16, 2024

Peguen left a comment

	return(!eCAL::Monitoring::SetExclFilter(std::string(filter_)));
	returnstatic_cast<int>(!eCAL::Monitoring::SetExclFilter(std::string(filter_)));

	return(!eCAL::Monitoring::SetInclFilter(std::string(filter_)));
	returnstatic_cast<int>(!eCAL::Monitoring::SetInclFilter(std::string(filter_)));

	return(!eCAL::Monitoring::SetFilterState(state_ != 0));
	returnstatic_cast<int>(!eCAL::Monitoring::SetFilterState(state_ != 0));

[core] Adapted c-api of monitoring in the way to remain c-return value compliant #1862

[core] Adapted c-api of monitoring in the way to remain c-return value compliant #1862

Conversation

hannemn commented Dec 16, 2024

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Dec 16, 2024

Choose a reason for hiding this comment

github-actions bot Dec 16, 2024

Choose a reason for hiding this comment

github-actions bot Dec 16, 2024

Choose a reason for hiding this comment

github-actions bot Dec 16, 2024

Choose a reason for hiding this comment

github-actions bot Dec 16, 2024

Choose a reason for hiding this comment

github-actions bot Dec 16, 2024

Choose a reason for hiding this comment

github-actions bot Dec 16, 2024

Choose a reason for hiding this comment

github-actions bot Dec 16, 2024

Choose a reason for hiding this comment

github-actions bot Dec 16, 2024

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Dec 16, 2024

Choose a reason for hiding this comment

github-actions bot Dec 16, 2024

Choose a reason for hiding this comment

github-actions bot Dec 16, 2024

Choose a reason for hiding this comment

github-actions bot Dec 16, 2024

Choose a reason for hiding this comment

Peguen left a comment

Choose a reason for hiding this comment