Corrected indentation

ros2 · Apr 3, 2018 · 0a516ea · 0a516ea
1 parent 3608349
commit 0a516ea
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 30 deletions.
diff --git a/rmw_fastrtps_cpp/src/rmw_client.cpp b/rmw_fastrtps_cpp/src/rmw_client.cpp
@@ -122,23 +122,21 @@ rmw_create_client(
   subscriberParam.topic.topicKind = NO_KEY;
   subscriberParam.topic.topicDataType = response_type_name;
   subscriberParam.historyMemoryPolicy = PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
-  if (!qos_policies->avoid_ros_namespace_conventions){
-  subscriberParam.topic.topicName = std::string(ros_service_response_prefix) + service_name;
-  }
-  else{
-  subscriberParam.topic.topicName = service_name;
+  if (!qos_policies->avoid_ros_namespace_conventions) {
+    subscriberParam.topic.topicName = std::string(ros_service_response_prefix) + service_name;
+  } else {
+    subscriberParam.topic.topicName = service_name;
   }
   subscriberParam.topic.topicName += "Reply";
 
   publisherParam.topic.topicKind = NO_KEY;
   publisherParam.topic.topicDataType = request_type_name;
   publisherParam.qos.m_publishMode.kind = ASYNCHRONOUS_PUBLISH_MODE;
   publisherParam.historyMemoryPolicy = PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
-  if (!qos_policies->avoid_ros_namespace_conventions){
-  publisherParam.topic.topicName = std::string(ros_service_requester_prefix) + service_name;
-  }
-  else{
-  publisherParam.topic.topicName = service_name;
+  if (!qos_policies->avoid_ros_namespace_conventions) {
+    publisherParam.topic.topicName = std::string(ros_service_requester_prefix) + service_name;
+  } else {
+    publisherParam.topic.topicName = service_name;
   }
   publisherParam.topic.topicName += "Request";
 

diff --git a/rmw_fastrtps_cpp/src/rmw_publisher.cpp b/rmw_fastrtps_cpp/src/rmw_publisher.cpp
@@ -102,11 +102,10 @@ rmw_create_publisher(
   publisherParam.historyMemoryPolicy = PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
   publisherParam.topic.topicKind = NO_KEY;
   publisherParam.topic.topicDataType = type_name;
-  if (!qos_policies->avoid_ros_namespace_conventions){
-  publisherParam.topic.topicName = std::string(ros_topic_prefix) + topic_name;
-  }
-  else{
-  publisherParam.topic.topicName = topic_name;
+  if (!qos_policies->avoid_ros_namespace_conventions) {
+    publisherParam.topic.topicName = std::string(ros_topic_prefix) + topic_name;
+  } else {
+    publisherParam.topic.topicName = topic_name;
   }
 
 #if HAVE_SECURITY

diff --git a/rmw_fastrtps_cpp/src/rmw_service.cpp b/rmw_fastrtps_cpp/src/rmw_service.cpp
@@ -133,23 +133,21 @@ rmw_create_service(
   subscriberParam.topic.topicKind = NO_KEY;
   subscriberParam.historyMemoryPolicy = PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
   subscriberParam.topic.topicDataType = request_type_name;
-  if (!qos_policies->avoid_ros_namespace_conventions){
-  subscriberParam.topic.topicName = std::string(ros_service_requester_prefix) + service_name;
-  }
-  else{
-  subscriberParam.topic.topicName = service_name;
+  if (!qos_policies->avoid_ros_namespace_conventions) {
+    subscriberParam.topic.topicName = std::string(ros_service_requester_prefix) + service_name;
+  } else {
+    subscriberParam.topic.topicName = service_name;
   }
   subscriberParam.topic.topicName += "Request";
 
   publisherParam.topic.topicKind = NO_KEY;
   publisherParam.topic.topicDataType = response_type_name;
   publisherParam.qos.m_publishMode.kind = ASYNCHRONOUS_PUBLISH_MODE;
   publisherParam.historyMemoryPolicy = PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
-  if (!qos_policies->avoid_ros_namespace_conventions){
-  publisherParam.topic.topicName = std::string(ros_service_response_prefix) + service_name;
-  }
-  else{
-  publisherParam.topic.topicName = service_name;
+  if (!qos_policies->avoid_ros_namespace_conventions) {
+    publisherParam.topic.topicName = std::string(ros_service_response_prefix) + service_name;
+  } else {
+    publisherParam.topic.topicName = service_name;
   }
   publisherParam.topic.topicName += "Reply";
 

diff --git a/rmw_fastrtps_cpp/src/rmw_subscription.cpp b/rmw_fastrtps_cpp/src/rmw_subscription.cpp
@@ -104,11 +104,10 @@ rmw_create_subscription(
   subscriberParam.historyMemoryPolicy = PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
   subscriberParam.topic.topicKind = NO_KEY;
   subscriberParam.topic.topicDataType = type_name;
-  if (!qos_policies->avoid_ros_namespace_conventions){
-  subscriberParam.topic.topicName = std::string(ros_topic_prefix) + topic_name;
-  }
-  else{
-  subscriberParam.topic.topicName = topic_name;
+  if (!qos_policies->avoid_ros_namespace_conventions) {
+    subscriberParam.topic.topicName = std::string(ros_topic_prefix) + topic_name;
+  } else {
+    subscriberParam.topic.topicName = topic_name;
   }
 
 #if HAVE_SECURITY