Narrow return type of location::set: cint -> bool

This commit is contained in:
Dmitry Bogatov
2019-10-13 15:16:32 +00:00
committed by Floris Bruynooghe
parent d16bdafaf0
commit a9dd78f622
3 changed files with 5 additions and 5 deletions

View File

@@ -1743,7 +1743,7 @@ pub unsafe extern "C" fn dc_set_location(
let ffi_context = &*context; let ffi_context = &*context;
ffi_context ffi_context
.with_inner(|ctx| location::set(ctx, latitude, longitude, accuracy)) .with_inner(|ctx| location::set(ctx, latitude, longitude, accuracy))
.unwrap_or(0) .unwrap_or(false) as _
} }
#[no_mangle] #[no_mangle]

View File

@@ -746,7 +746,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
let longitude = arg2.parse()?; let longitude = arg2.parse()?;
let continue_streaming = location::set(context, latitude, longitude, 0.); let continue_streaming = location::set(context, latitude, longitude, 0.);
if 0 != continue_streaming { if continue_streaming {
println!("Success, streaming should be continued."); println!("Success, streaming should be continued.");
} else { } else {
println!("Success, streaming can be stoppped."); println!("Success, streaming can be stoppped.");

View File

@@ -257,9 +257,9 @@ pub fn is_sending_locations_to_chat(context: &Context, chat_id: u32) -> bool {
.unwrap_or_default() .unwrap_or_default()
} }
pub fn set(context: &Context, latitude: f64, longitude: f64, accuracy: f64) -> libc::c_int { pub fn set(context: &Context, latitude: f64, longitude: f64, accuracy: f64) -> bool {
if latitude == 0.0 && longitude == 0.0 { if latitude == 0.0 && longitude == 0.0 {
return 1; return true;
} }
let mut continue_streaming = false; let mut continue_streaming = false;
@@ -293,7 +293,7 @@ pub fn set(context: &Context, latitude: f64, longitude: f64, accuracy: f64) -> l
schedule_MAYBE_SEND_LOCATIONS(context, 0); schedule_MAYBE_SEND_LOCATIONS(context, 0);
} }
continue_streaming as libc::c_int continue_streaming
} }
pub fn get_range( pub fn get_range(