cr comments

Author: stuqdog

CMakeLists.txt

@@ -270,8 +270,7 @@ elseif(NOT WIN32 OR (CMAKE_SYSTEM_PROCESSOR STREQUAL "X86") OR (CMAKE_SYSTEM_PRO
   set(lvru_system_name ${CMAKE_SYSTEM_NAME})
   if (CMAKE_SYSTEM_NAME STREQUAL "Cygwin")
     set(lvru_system_name "windows")
-  endif()
-  if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(lvru_system_name "macosx")
   endif()
   set(lvru_system_processor ${CMAKE_SYSTEM_PROCESSOR})

src/viam/sdk/rpc/dial.cpp

@@ -1,6 +1,6 @@
-#include <algorithm>
 #include <viam/sdk/rpc/dial.hpp>
 
+#include <algorithm>
 #include <istream>
 #include <string>
 
@@ -151,17 +151,16 @@ std::shared_ptr<ViamChannel> ViamChannel::dial(const char* uri,
     }
     char* proxy_path = ::dial(
         uri, entity, type, payload, opts.allows_insecure_downgrade(), float_timeout.count(), ptr);
-    if (proxy_path == NULL) {
+    if (!proxy_path) {
         free_rust_runtime(ptr);
         throw Exception(ErrorCondition::k_connection, "Unable to establish connecting path");
     }
 
     std::string localhost_prefix("127.0.0.1");
-    auto tcp_check = std::mismatch(localhost_prefix.begin(), localhost_prefix.end(), proxy_path);
     std::string address;
-    if (tcp_check.first != localhost_prefix.end()) {
-        // proxy path is not a localhost address and is therefore a UDS socket
-        address += "unix://";
+    if (std::string(proxy_path).find(localhost_prefix) == std::string::npos) {
+        // proxy path is not a localhost address and is therefore a unix domain socket (UDS)
+        address += "unix:";
     }
     address += proxy_path;