Make dc_msg_is_starred() return bool

This commit is contained in:
Dmitry Bogatov
2019-07-30 14:08:15 +00:00
parent 73298c0273
commit a41c0614cc
3 changed files with 5 additions and 10 deletions

View File

@@ -1361,7 +1361,7 @@ pub unsafe extern "C" fn dc_msg_is_sent(msg: *mut dc_msg::dc_msg_t) -> libc::c_i
#[no_mangle]
pub unsafe extern "C" fn dc_msg_is_starred(msg: *mut dc_msg::dc_msg_t) -> libc::c_int {
dc_msg::dc_msg_is_starred(msg)
dc_msg::dc_msg_is_starred(msg).into()
}
#[no_mangle]

View File

@@ -246,11 +246,7 @@ unsafe fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: *mut dc_msg_t
as_str(contact_name),
contact_id,
as_str(msgtext),
if 0 != dc_msg_is_starred(msg) {
""
} else {
""
},
if dc_msg_is_starred(msg) { "" } else { "" },
if dc_msg_get_from_id(msg) == 1 as libc::c_uint {
""
} else if dc_msg_get_state(msg) == DC_STATE_IN_SEEN {

View File

@@ -949,12 +949,11 @@ pub unsafe fn dc_msg_is_sent(msg: *const dc_msg_t) -> libc::c_int {
}
}
// TODO should return bool /rtn
pub unsafe fn dc_msg_is_starred(msg: *const dc_msg_t) -> libc::c_int {
pub unsafe fn dc_msg_is_starred(msg: *const dc_msg_t) -> bool {
if msg.is_null() || (*msg).magic != 0x11561156i32 as libc::c_uint {
return 0i32;
return false;
}
return if 0 != (*msg).starred { 1i32 } else { 0i32 };
0 != (*msg).starred
}
// TODO should return bool /rtn