From 8b4acbb63a8dee66e7ff5a8ce43351ea0429967c Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Tue, 23 Jul 2019 02:33:49 +0300 Subject: [PATCH] Move dc_array_get_ptr inside dc_array_t implementation --- src/dc_array.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/dc_array.rs b/src/dc_array.rs index d97598aba..7f407a709 100644 --- a/src/dc_array.rs +++ b/src/dc_array.rs @@ -51,6 +51,10 @@ impl dc_array_t { } } + pub fn get_ptr(&self, index: size_t) -> *mut libc::c_void { + self.array[index] as *mut libc::c_void + } + pub fn is_empty(&self) -> bool { self.array.is_empty() } @@ -126,9 +130,10 @@ pub unsafe fn dc_array_get_id(array: *const dc_array_t, index: size_t) -> uint32 pub unsafe fn dc_array_get_ptr(array: *const dc_array_t, index: size_t) -> *mut libc::c_void { if array.is_null() || index >= (*array).len() { - return 0 as *mut libc::c_void; + std::ptr::null_mut() + } else { + (*array).get_ptr(index) } - (*array).array[index] as *mut libc::c_void } pub unsafe fn dc_array_get_latitude(array: *const dc_array_t, index: size_t) -> libc::c_double {