From 2340b9be48a0f1d56b8813edb75dfc67646a595d Mon Sep 17 00:00:00 2001 From: jikstra Date: Mon, 22 Jul 2019 17:57:53 +0200 Subject: [PATCH] Replace OK_TO_CONTINUE = false with close call, remove ifs for OK_TO_CONTINUE --- src/dc_qr.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/dc_qr.rs b/src/dc_qr.rs index 8502f0a64..d3bba2dc9 100644 --- a/src/dc_qr.rs +++ b/src/dc_qr.rs @@ -21,7 +21,6 @@ use crate::x::*; // text1=URL // text1=error string pub unsafe fn dc_check_qr(context: &Context, qr: *const libc::c_char) -> *mut dc_lot_t { - let mut OK_TO_CONTINUE = true; let mut payload: *mut libc::c_char = 0 as *mut libc::c_char; // must be normalized, if set let mut addr: *mut libc::c_char = 0 as *mut libc::c_char; @@ -148,7 +147,7 @@ pub unsafe fn dc_check_qr(context: &Context, qr: *const libc::c_char) -> *mut dc (*qr_parsed).state = 400i32; (*qr_parsed).text1 = dc_strdup(b"Bad e-mail address.\x00" as *const u8 as *const libc::c_char); - OK_TO_CONTINUE = false; + return cleanup(); } } else { if strncasecmp( @@ -217,7 +216,7 @@ pub unsafe fn dc_check_qr(context: &Context, qr: *const libc::c_char) -> *mut dc (*qr_parsed).state = 400i32; (*qr_parsed).text1 = dc_strdup(b"Bad e-mail address.\x00" as *const u8 as *const libc::c_char); - OK_TO_CONTINUE = false; + return cleanup(); } } } @@ -230,7 +229,7 @@ pub unsafe fn dc_check_qr(context: &Context, qr: *const libc::c_char) -> *mut dc b"Bad fingerprint length in QR code.\x00" as *const u8 as *const libc::c_char, ); - OK_TO_CONTINUE = false; + return cleanup(); } } }