Naming: replace context_name with security_context

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
ros2 · Mar 19, 2020 · afa5ffd · afa5ffd
1 parent 022f2e2
commit afa5ffd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/rmw/include/rmw/init_options.h b/rmw/include/rmw/init_options.h
@@ -54,8 +54,8 @@ typedef struct RMW_PUBLIC_TYPE rmw_init_options_t
   rmw_security_options_t security_options;
   /// Enable localhost only
   rmw_localhost_only_t localhost_only;
-  /// Context name
-  char * name;
+  /// Security context
+  char * security_context;
 
   // TODO(wjwwood): replace with rmw_allocator_t when that refactor happens
   /// Allocator used during internal allocation of init options, if needed.

diff --git a/rmw/include/rmw/rmw.h b/rmw/include/rmw/rmw.h
@@ -1043,23 +1043,23 @@ rmw_get_node_names(
   rcutils_string_array_t * node_names,
   rcutils_string_array_t * node_namespaces);
 
-/// Return a list of node name and namespaces discovered via a node, with its context names.
+/// Return a list of node name and namespaces discovered via a node with its security context.
 /**
- * \sa Similar to rmw_get_node_names, but it also provides the context names of each node.
+ * \sa Similar to rmw_get_node_names, but it also provides the security context name.
  *
  * \param[in] node the handle to the node being used to query the ROS graph
  * \param[out] node_names a list of discovered node names
  * \param[out] node_namespaces a list of discovered node namespaces
- * \param[out] context_names list with the context names of the nodes
+ * \param[out] security_contexts list of the security context of the nodes
  * \return `RMW_RET_OK` if node the query was made successfully, or
  * \return `RMW_RET_ERROR` if an unspecified error occurs.
  */
 rmw_ret_t
-rmw_get_node_names_with_context_names(
+rmw_get_node_names_with_security_contexts(
   const rmw_node_t * node,
   rcutils_string_array_t * node_names,
   rcutils_string_array_t * node_namespaces,
-  rcutils_string_array_t * context_names);
+  rcutils_string_array_t * security_contexts);
 
 RMW_PUBLIC
 RMW_WARN_UNUSED

diff --git a/rmw/src/init_options.c b/rmw/src/init_options.c
@@ -31,7 +31,7 @@ rmw_get_zero_initialized_init_options(void)
            .implementation_identifier = NULL,
            .impl = NULL,
            .instance_id = 0,
-           .name = NULL,
+           .security_context = NULL,
            .security_options = rmw_get_default_security_options(),
   };  // NOLINT(readability/braces): false positive
 }