PR comments.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Bit-Quill · Mar 8, 2024 · 93186f3 · 93186f3
1 parent 88277c1
commit 93186f3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/csharp/lib/AsyncClient.cs b/csharp/lib/AsyncClient.cs
@@ -62,9 +62,9 @@ private void SuccessCallback(ulong index, IntPtr str)
         });
     }
 
-    private void FailureCallback(ulong index, ErrorType error_type, IntPtr ptr)
+    private void FailureCallback(ulong index, ErrorType error_type, IntPtr error_msg_ptr)
     {
-        var error = ptr == IntPtr.Zero ? null : Marshal.PtrToStringAnsi(ptr);
+        var error = error_msg_ptr == IntPtr.Zero ? null : Marshal.PtrToStringAnsi(error_msg_ptr);
         // Work needs to be offloaded from the calling thread, because otherwise we might starve the client's thread pool.
         _ = Task.Run(() => messageContainer.GetMessage((int)index)
                 .SetException(Errors.MakeException(error_type, error)));
@@ -98,8 +98,8 @@ private void FailureCallback(ulong index, ErrorType error_type, IntPtr ptr)
     /// </summary>
     /// <param name="index">Request ID</param>
     /// <param name="error_type">Error type</param>
-    /// <param name="error">Error message</param>
-    private delegate void FailureAction(ulong index, ErrorType error_type, IntPtr error);
+    /// <param name="error_msg_ptr">Error message</param>
+    private delegate void FailureAction(ulong index, ErrorType error_type, IntPtr error_msg_ptr);
     [DllImport("libglide_rs", CallingConvention = CallingConvention.Cdecl, EntryPoint = "get")]
     private static extern void GetFfi(IntPtr client, ulong index, IntPtr key);
 

diff --git a/csharp/lib/src/lib.rs b/csharp/lib/src/lib.rs
@@ -120,8 +120,8 @@ pub extern "C" fn set(
             match result {
                 Ok(_) => (client.success_callback)(callback_index, std::ptr::null()), // TODO - should return "OK" string.
                 Err(err) => {
-                    logger_core::log_debug("command error", format!("callback {}, error {}, kind {:?}, code {:?}, category {:?}, detail {:?}", callback_index, err, err.kind(), err.code(), err.category(), err.detail()));
-                    let c_err_str = CString::new(error_message(&err)).expect("CString::new failed");
+                    logger_core::log_debug("command error", format!("callback: {}, error: {}", callback_index, err));
+                    let c_err_str = CString::new(error_message(&err)).unwrap();
                     (client.failure_callback)(callback_index, error_type(&err), c_err_str.as_ptr())
                 }
             };
@@ -149,8 +149,8 @@ pub extern "C" fn get(client_ptr: *const c_void, callback_index: usize, key: *co
             Ok(value) => value,
             Err(err) => {
                 unsafe {
-                    logger_core::log_debug("command error", format!("callback {}, error {}, kind {:?}, code {:?}, category {:?}, detail {:?}", callback_index, err, err.kind(), err.code(), err.category(), err.detail()));
-                    let c_err_str = CString::new(error_message(&err)).expect("CString::new failed");
+                    logger_core::log_debug("command error", format!("callback: {}, error: {}", callback_index, err));
+                    let c_err_str = CString::new(error_message(&err)).unwrap();
                     (client.failure_callback)(callback_index, error_type(&err), c_err_str.as_ptr())
                 };
                 return;
@@ -163,8 +163,8 @@ pub extern "C" fn get(client_ptr: *const c_void, callback_index: usize, key: *co
                 Ok(None) => (client.success_callback)(callback_index, std::ptr::null()),
                 Ok(Some(c_str)) => (client.success_callback)(callback_index, c_str.as_ptr()),
                 Err(err) => {
-                    logger_core::log_debug("command error", format!("callback {}, error {}, kind {:?}, code {:?}, category {:?}, detail {:?}", callback_index, err, err.kind(), err.code(), err.category(), err.detail()));
-                    let c_err_str = CString::new(error_message(&err)).expect("CString::new failed");
+                    logger_core::log_debug("command error", format!("callback: {}, error: {}", callback_index, err));
+                    let c_err_str = CString::new(error_message(&err)).unwrap();
                     (client.failure_callback)(callback_index, error_type(&err), c_err_str.as_ptr())
                 }
             };