Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-03 05:16:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #298 from deltachat/remove_gotos_dc_strencode

Browse Source 
Remove gotos from dc_strencode
This commit is contained in:
Jikstra
2019-08-07 23:41:33 +02:00
committed by GitHub
parent 721dcd7ccd 70f6aa9d3a
commit ee264117d3
1 changed files with 69 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/dc_strencode.rs
View File

@@ -120,24 +120,20 @@ fn hex_2_int(ch: libc::c_char) -> libc::c_char {
} }
pub unsafe fn dc_encode_header_words(to_encode: *const libc::c_char) -> *mut libc::c_char { pub unsafe fn dc_encode_header_words(to_encode: *const libc::c_char) -> *mut libc::c_char {
let mut current_block: u64; let mut ok_to_continue = true;
let mut ret_str: *mut libc::c_char = 0 as *mut libc::c_char; let mut ret_str: *mut libc::c_char = 0 as *mut libc::c_char;
let mut cur: *const libc::c_char = to_encode; let mut cur: *const libc::c_char = to_encode;
let mmapstr: *mut MMAPString = mmap_string_new(b"\x00" as *const u8 as *const libc::c_char); let mmapstr: *mut MMAPString = mmap_string_new(b"\x00" as *const u8 as *const libc::c_char);
if to_encode.is_null() || mmapstr.is_null() { if to_encode.is_null() || mmapstr.is_null() {
current_block = 8550051112593613029; ok_to_continue = false;
} else {
current_block = 4644295000439058019;
} }
loop { loop {
match current_block { if !ok_to_continue {
8550051112593613029 => {
if !mmapstr.is_null() { if !mmapstr.is_null() {
mmap_string_free(mmapstr); mmap_string_free(mmapstr);
} }
break; break;
} } else {
_ => {
if *cur as libc::c_int != '\u{0}' as i32 { if *cur as libc::c_int != '\u{0}' as i32 {
let begin: *const libc::c_char; let begin: *const libc::c_char;
let mut end: *const libc::c_char; let mut end: *const libc::c_char;
@@ -165,12 +161,12 @@ pub unsafe fn dc_encode_header_words(to_encode: *const libc::c_char) -> *mut lib
begin, begin,
end.wrapping_offset_from(begin) as size_t, end.wrapping_offset_from(begin) as size_t,
) { ) {
current_block = 8550051112593613029; ok_to_continue = false;
continue; continue;
} }
if *end as libc::c_int == ' ' as i32 || *end as libc::c_int == '\t' as i32 { if *end as libc::c_int == ' ' as i32 || *end as libc::c_int == '\t' as i32 {
if mmap_string_append_c(mmapstr, *end).is_null() { if mmap_string_append_c(mmapstr, *end).is_null() {
current_block = 8550051112593613029; ok_to_continue = false;
continue; continue;
} }
end = end.offset(1isize) end = end.offset(1isize)
@@ -183,7 +179,7 @@ pub unsafe fn dc_encode_header_words(to_encode: *const libc::c_char) -> *mut lib
) )
.is_null() .is_null()
{ {
current_block = 8550051112593613029; ok_to_continue = false;
continue; continue;
} }
} }
@@ -194,23 +190,20 @@ pub unsafe fn dc_encode_header_words(to_encode: *const libc::c_char) -> *mut lib
) )
.is_null() .is_null()
{ {
current_block = 8550051112593613029; ok_to_continue = false;
continue; continue;
} }
if !(*cur as libc::c_int == ' ' as i32 || *cur as libc::c_int == '\t' as i32) { if !(*cur as libc::c_int == ' ' as i32 || *cur as libc::c_int == '\t' as i32) {
current_block = 4644295000439058019;
continue; continue;
} }
if mmap_string_append_c(mmapstr, *cur).is_null() { if mmap_string_append_c(mmapstr, *cur).is_null() {
current_block = 8550051112593613029; ok_to_continue = false;
continue; continue;
} }
cur = cur.offset(1isize); cur = cur.offset(1isize);
current_block = 4644295000439058019;
} else { } else {
ret_str = strdup((*mmapstr).str_0); ret_str = strdup((*mmapstr).str_0);
current_block = 8550051112593613029; ok_to_continue = false;
}
} }
} }
} }