From 965d41990edbb019c8b058e71d7150ae158bc960 Mon Sep 17 00:00:00 2001 From: jikstra Date: Wed, 4 Dec 2019 03:18:34 +0100 Subject: [PATCH] change return to "" for errors --- deltachat-ffi/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs index 085980423..8f6a6d484 100644 --- a/deltachat-ffi/src/lib.rs +++ b/deltachat-ffi/src/lib.rs @@ -2384,7 +2384,7 @@ pub unsafe extern "C" fn dc_chat_get_info_json( ) -> *mut libc::c_char { if context.is_null() { eprintln!("ignoring careless call to dc_chat_get_info_json()"); - return ptr::null_mut(); // NULL explicitly defined as "error" + return "".strdup(); } let ffi_context = &*context; ffi_context @@ -2392,10 +2392,10 @@ pub unsafe extern "C" fn dc_chat_get_info_json( Ok(s) => s.strdup(), Err(err) => { error!(ctx, "get_info_json({}) returned: {}", chat_id, err); - return ptr::null_mut(); + return "".strdup(); } }) - .unwrap_or_else(|_| ptr::null_mut()) + .unwrap_or_else(|_| "".strdup()) } // dc_msg_t