diff --git a/deltachat-ffi/deltachat.h b/deltachat-ffi/deltachat.h index 791d1600f..cd29a6665 100644 --- a/deltachat-ffi/deltachat.h +++ b/deltachat-ffi/deltachat.h @@ -196,9 +196,9 @@ typedef struct _dc_event dc_event_t; dc_event_t* dc_get_next_event(dc_context_t* context); int dc_event_get_id (dc_event_t* event); -int dc_event_get_data1(dc_event_t* event); -int dc_event_get_data2(dc_event_t* event); -char* dc_event_get_data_string(dc_event_t* event); +int dc_event_get_data1_int(dc_event_t* event); +int dc_event_get_data2_int(dc_event_t* event); +char* dc_event_get_data3_str(dc_event_t* event); /** * TODO: document diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs index 094b40883..122076310 100644 --- a/deltachat-ffi/src/lib.rs +++ b/deltachat-ffi/src/lib.rs @@ -525,9 +525,9 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int } #[no_mangle] -pub unsafe extern "C" fn dc_event_get_data1(event: *mut dc_event_t) -> libc::c_int { +pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc::c_int { if event.is_null() { - eprintln!("ignoring careless call to dc_event_get_data1()"); + eprintln!("ignoring careless call to dc_event_get_data1_int()"); return 0; } @@ -566,9 +566,9 @@ pub unsafe extern "C" fn dc_event_get_data1(event: *mut dc_event_t) -> libc::c_i } #[no_mangle] -pub unsafe extern "C" fn dc_event_get_data2(event: *mut dc_event_t) -> libc::c_int { +pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc::c_int { if event.is_null() { - eprintln!("ignoring careless call to dc_event_get_data2()"); + eprintln!("ignoring careless call to dc_event_get_data2_int()"); return 0; } @@ -605,9 +605,9 @@ pub unsafe extern "C" fn dc_event_get_data2(event: *mut dc_event_t) -> libc::c_i } #[no_mangle] -pub unsafe extern "C" fn dc_event_get_data_string(event: *mut dc_event_t) -> *mut libc::c_char { +pub unsafe extern "C" fn dc_event_get_data3_str(event: *mut dc_event_t) -> *mut libc::c_char { if event.is_null() { - eprintln!("ignoring careless call to dc_event_get_data_string()"); + eprintln!("ignoring careless call to dc_event_get_data3_str()"); return ptr::null_mut(); }