Additional AdminClient operations.

Use cstr_to_owned

Author: jsantander

src/group_description.rs

@@ -2,10 +2,10 @@
 
 use crate::error::{IsError, KafkaError, RDKafkaError};
 use crate::group_description::ConsumerGroupState::Invalid;
+use crate::util::cstr_to_owned;
 use crate::TopicPartitionList;
 use rdkafka_sys as rdsys;
 use rdkafka_sys::types::*;
-use std::ffi::CStr;
 
 /// Result of the `AdminClient::describe_consumer_groups` method.
 pub type ConsumerGroupDescriptionResult = Result<ConsumerGroupDescription, (String, KafkaError)>;
@@ -66,9 +66,7 @@ impl ConsumerGroupDescription {
     pub(crate) unsafe fn from_ptr(
         ptr: *const RDKafkaConsumerGroupDescription,
     ) -> ConsumerGroupDescriptionResult {
-        let group_id = CStr::from_ptr(rdsys::rd_kafka_ConsumerGroupDescription_group_id(ptr))
-            .to_string_lossy()
-            .into_owned();
+        let group_id = cstr_to_owned(rdsys::rd_kafka_ConsumerGroupDescription_group_id(ptr));
 
         let kafka_error =
             RDKafkaError::from_ptr(rdsys::rd_kafka_ConsumerGroupDescription_error(ptr) as *mut _);
@@ -78,11 +76,9 @@ impl ConsumerGroupDescription {
             let is_simple_consumer_group: bool =
                 rdsys::rd_kafka_ConsumerGroupDescription_is_simple_consumer_group(ptr) != 0;
 
-            let partition_assignor = CStr::from_ptr(
+            let partition_assignor = cstr_to_owned(
                 rdsys::rd_kafka_ConsumerGroupDescription_partition_assignor(ptr),
-            )
-                .to_string_lossy()
-                .into_owned();
+            );
 
             let mut acl_count = 0;
             let acl_list =
@@ -257,15 +253,13 @@ pub struct Node {
 impl Node {
     pub(crate) unsafe fn from_ptr(ptr: *const RDKafkaNode) -> Node {
         let id = rdsys::rd_kafka_Node_id(ptr);
-        let host = CStr::from_ptr(rdsys::rd_kafka_Node_host(ptr))
-            .to_string_lossy()
-            .into_owned();
+        let host = cstr_to_owned(rdsys::rd_kafka_Node_host(ptr));
         let port = rdsys::rd_kafka_Node_port(ptr);
         let rack_ptr = rdsys::rd_kafka_Node_rack(ptr);
         let rack = if rack_ptr.is_null() {
             None
         } else {
-            Some(CStr::from_ptr(rack_ptr).to_string_lossy().into_owned())
+            Some(cstr_to_owned(rack_ptr))
         };
         Node {
             id,
@@ -341,25 +335,15 @@ impl MemberDescription {
     pub(crate) unsafe fn from_ptr(
         ptr: *const RDKafkaMemberDescription,
     ) -> MemberDescription {
-        let client_id = CStr::from_ptr(rdsys::rd_kafka_MemberDescription_client_id(ptr))
-            .to_string_lossy()
-            .into_owned();
+        let client_id = cstr_to_owned(rdsys::rd_kafka_MemberDescription_client_id(ptr));
         let group_instance_id_ptr = rdsys::rd_kafka_MemberDescription_group_instance_id(ptr);
         let group_instance_id = if group_instance_id_ptr.is_null() {
             None
         } else {
-            Some(
-                CStr::from_ptr(group_instance_id_ptr)
-                    .to_string_lossy()
-                    .into_owned(),
-            )
+            Some(cstr_to_owned(group_instance_id_ptr))
         };
-        let consumer_id = CStr::from_ptr(rdsys::rd_kafka_MemberDescription_consumer_id(ptr))
-            .to_string_lossy()
-            .into_owned();
-        let host = CStr::from_ptr(rdsys::rd_kafka_MemberDescription_host(ptr))
-            .to_string_lossy()
-            .into_owned();
+        let consumer_id = cstr_to_owned(rdsys::rd_kafka_MemberDescription_consumer_id(ptr));
+        let host = cstr_to_owned(rdsys::rd_kafka_MemberDescription_host(ptr));
         let assignment_ptr = rdsys::rd_kafka_MemberDescription_assignment(ptr);
         let assignment = if assignment_ptr.is_null() {
             None