Merge pull request #14 from ros2/fix_error_string

fix rmw error strings

Author: dirk-thomas

rmw/CMakeLists.txt

@@ -1,11 +1,15 @@
 cmake_minimum_required(VERSION 2.8.3)
 
-project(rmw NONE)
+project(rmw C)
 
 find_package(ament_cmake REQUIRED)
 
+include_directories(include)
+add_library(${PROJECT_NAME} SHARED "src/error_handling.c")
+
 ament_export_dependencies(rosidl_generator_c)
 ament_export_include_directories(include)
+ament_export_libraries(${PROJECT_NAME})
 
 if(AMENT_ENABLE_TESTING)
   find_package(ament_lint_auto REQUIRED)
@@ -22,3 +26,9 @@ install(
   DIRECTORY include/
   DESTINATION include
 )
+install(
+  TARGETS ${PROJECT_NAME}
+  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib
+  RUNTIME DESTINATION bin
+)

rmw/include/rmw/error_handling.h

@@ -20,26 +20,16 @@ extern "C"
 {
 #endif
 
-#include <string.h>
-
 #include "macros.h"
 #include "visibility_control.h"
 
-RMW_THREAD_LOCAL char * __rmw_error_string = 0;
-
-RMW_LOCAL
+RMW_PUBLIC
 void
-rmw_set_error_string(const char * error_string)
-{
-  __rmw_error_string = strdup(error_string);
-}
+rmw_set_error_string(const char * error_string);
 
-RMW_LOCAL
+RMW_PUBLIC
 const char *
-rmw_get_error_string()
-{
-  return __rmw_error_string;
-}
+rmw_get_error_string();
 
 #if __cplusplus
 }

rmw/src/error_handling.c

@@ -0,0 +1,31 @@
+// Copyright 2015 Open Source Robotics Foundation, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <string.h>
+
+#include <rmw/error_handling.h>
+
+RMW_THREAD_LOCAL char * __rmw_error_string = 0;
+
+void
+rmw_set_error_string(const char * error_string)
+{
+  __rmw_error_string = strdup(error_string);
+}
+
+const char *
+rmw_get_error_string()
+{
+  return __rmw_error_string;
+}