Fix some errors

Author: minggangw

src/rcl_bindings.cpp

@@ -14,7 +14,6 @@
 
 #include "rcl_bindings.h"
 
-#include <napi.h>
 #include <node.h>
 #include <rcl/arguments.h>
 #include <rcl/error_handling.h>
@@ -59,8 +58,7 @@
 
 namespace rclnodejs {
 
-static Napi::Object wrapParameters(
-    Napi::Env env, rcl_params_t* params);  // NOLINT(whitespace/line_length)
+static Napi::Object wrapParameters(Napi::Env env, rcl_params_t* params);
 
 Napi::Value InitRclnodejs(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
@@ -71,12 +69,12 @@ Napi::Value InitRclnodejs(const Napi::CallbackInfo& info) {
                            rcl_init_options_init(&init_options, allocator),
                            rcl_get_error_string().str);
 
-  // preprocess Context
+  // Preprocess Context
   RclHandle* context_handle = RclHandle::Unwrap(info[0].As<Napi::Object>());
   rcl_context_t* context =
       reinterpret_cast<rcl_context_t*>(context_handle->ptr());
 
-  // preprocess argc & argv
+  // Preprocess argc & argv
   Napi::Array jsArgv = info[1].As<Napi::Array>();
   int argc = jsArgv.Length();
   char** argv = nullptr;
@@ -1740,7 +1738,7 @@ Napi::Value GetClientNamesAndTypesByNode(const Napi::CallbackInfo& info) {
       rcl_get_zero_initialized_names_and_types();
   rcl_allocator_t allocator = rcl_get_default_allocator();
   THROW_ERROR_IF_NOT_EQUAL(RCL_RET_OK,
-                           rcl_get_service_names_and_types_by_node(
+                           rcl_get_client_names_and_types_by_node(
                                node, &allocator, node_name.c_str(),
                                node_namespace.c_str(), &client_names_and_types),
                            "Failed to get_client_names_and_types.");

src/rcl_bindings.h

@@ -25,15 +25,6 @@
 
 namespace rclnodejs {
 
-typedef Napi::Value (*JsCFunction)(const Napi::CallbackInfo& info);
-
-typedef struct {
-  const char* name;
-  JsCFunction function;
-} BindingMethod;
-
-extern rcl_guard_condition_t* g_sigint_gc;
-
 void ExtractNamesAndTypes(rcl_names_and_types_t names_and_types,
                           Napi::Array* result_list);
 

src/rcl_handle.cpp

@@ -17,8 +17,6 @@
 #include <rcl/error_handling.h>
 #include <rcl/rcl.h>
 
-#include <iostream>
-
 #include "rcl_utilities.h"
 
 namespace rclnodejs {

src/rcl_lifecycle_bindings.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Intel Corporation. All rights reserved.
+// Copyright (c) 2020 Wayne Parrott. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

src/rcl_utilities.cpp

@@ -21,7 +21,10 @@
 #include <string>
 
 namespace {
+
 uv_lib_t g_lib;
+Napi::Env g_env = nullptr;
+
 }  // namespace
 
 namespace rclnodejs {
@@ -95,4 +98,8 @@ std::string GetErrorMessageAndClear() {
   return std::string(uv_dlerror(&g_lib));
 }
 
+Napi::Env& GetEnv() { return g_env; }
+
+void StoreEnv(Napi::Env current_env) { g_env = current_env; }
+
 }  // namespace rclnodejs

src/rcl_utilities.h

@@ -38,12 +38,8 @@ const rosidl_action_type_support_t* GetActionTypeSupport(
 std::string GetErrorMessageAndClear();
 
 // Store a reference to the environment that can be used for error reporting.
-inline Napi::Env& GetEnv() {
-  static thread_local Napi::Env env = nullptr;
-  return env;
-}
-
-inline void StoreEnv(Napi::Env current_env) { GetEnv() = current_env; }
+Napi::Env& GetEnv();
+void StoreEnv(Napi::Env current_env);
 
 }  // namespace rclnodejs