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

Replace gotos with ok_to_continue (is_valid) approach

Browse Source
This commit is contained in:
jikstra
2019-08-07 19:00:28 +02:00
parent 4d9bd46c9d
commit 164130a83f
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/dc_saxparser.rs
View File

@@ -80,7 +80,7 @@ pub unsafe fn dc_saxparser_set_text_handler(
} }
pub unsafe fn dc_saxparser_parse(saxparser: *mut dc_saxparser_t, buf_start__: *const libc::c_char) { pub unsafe fn dc_saxparser_parse(saxparser: *mut dc_saxparser_t, buf_start__: *const libc::c_char) {
let current_block: u64; let mut is_valid = false;
let mut bak: libc::c_char; let mut bak: libc::c_char;
let buf_start: *mut libc::c_char; let buf_start: *mut libc::c_char;
let mut last_text_start: *mut libc::c_char; let mut last_text_start: *mut libc::c_char;
@@ -99,7 +99,7 @@ pub unsafe fn dc_saxparser_parse(saxparser: *mut dc_saxparser_t, buf_start__: *c
p = buf_start; p = buf_start;
loop { loop {
if !(0 != *p) { if !(0 != *p) {
current_block = 13425230902034816933; is_valid = true;
break; break;
} }
if *p as libc::c_int == '<' as i32 { if *p as libc::c_int == '<' as i32 {
@@ -113,7 +113,6 @@ pub unsafe fn dc_saxparser_parse(saxparser: *mut dc_saxparser_t, buf_start__: *c
if strncmp(p, b"!--\x00" as *const u8 as *const libc::c_char, 3) == 0i32 { if strncmp(p, b"!--\x00" as *const u8 as *const libc::c_char, 3) == 0i32 {
p = strstr(p, b"-->\x00" as *const u8 as *const libc::c_char); p = strstr(p, b"-->\x00" as *const u8 as *const libc::c_char);
if p.is_null() { if p.is_null() {
current_block = 7627180618761592946;
break; break;
} }
p = p.offset(3isize) p = p.offset(3isize)
@@ -137,7 +136,6 @@ pub unsafe fn dc_saxparser_parse(saxparser: *mut dc_saxparser_t, buf_start__: *c
strlen(text_beg), strlen(text_beg),
'c' as i32 as libc::c_char, 'c' as i32 as libc::c_char,
); );
current_block = 7627180618761592946;
break; break;
} }
} else if strncmp(p, b"!DOCTYPE\x00" as *const u8 as *const libc::c_char, 8) == 0i32 { } else if strncmp(p, b"!DOCTYPE\x00" as *const u8 as *const libc::c_char, 8) == 0i32 {
@@ -149,13 +147,11 @@ pub unsafe fn dc_saxparser_parse(saxparser: *mut dc_saxparser_t, buf_start__: *c
} }
if *p as libc::c_int == 0i32 { if *p as libc::c_int == 0i32 {
/* unclosed doctype */ /* unclosed doctype */
current_block = 7627180618761592946;
break; break;
} else if *p as libc::c_int == '[' as i32 { } else if *p as libc::c_int == '[' as i32 {
p = strstr(p, b"]>\x00" as *const u8 as *const libc::c_char); p = strstr(p, b"]>\x00" as *const u8 as *const libc::c_char);
if p.is_null() { if p.is_null() {
/* unclosed inline doctype */ /* unclosed inline doctype */
current_block = 7627180618761592946;
break; break;
} else { } else {
p = p.offset(2isize) p = p.offset(2isize)
@@ -167,7 +163,6 @@ pub unsafe fn dc_saxparser_parse(saxparser: *mut dc_saxparser_t, buf_start__: *c
p = strstr(p, b"?>\x00" as *const u8 as *const libc::c_char); p = strstr(p, b"?>\x00" as *const u8 as *const libc::c_char);
if p.is_null() { if p.is_null() {
/* unclosed processing instruction */ /* unclosed processing instruction */
current_block = 7627180618761592946;
break; break;
} else { } else {
p = p.offset(2isize) p = p.offset(2isize)
@@ -328,7 +323,6 @@ pub unsafe fn dc_saxparser_parse(saxparser: *mut dc_saxparser_t, buf_start__: *c
p = strchr(p, '>' as i32); p = strchr(p, '>' as i32);
if p.is_null() { if p.is_null() {
/* unclosed start-tag or end-tag */ /* unclosed start-tag or end-tag */
current_block = 7627180618761592946;
break; break;
} else { } else {
p = p.offset(1isize) p = p.offset(1isize)
@@ -339,8 +333,7 @@ pub unsafe fn dc_saxparser_parse(saxparser: *mut dc_saxparser_t, buf_start__: *c
p = p.offset(1isize) p = p.offset(1isize)
} }
} }
match current_block { if is_valid {
13425230902034816933 => {
call_text_cb( call_text_cb(
saxparser, saxparser,
last_text_start, last_text_start,
@@ -348,8 +341,6 @@ pub unsafe fn dc_saxparser_parse(saxparser: *mut dc_saxparser_t, buf_start__: *c
'&' as i32 as libc::c_char, '&' as i32 as libc::c_char,
); );
} }
_ => {}
}
do_free_attr(attr.as_mut_ptr(), free_attr.as_mut_ptr()); do_free_attr(attr.as_mut_ptr(), free_attr.as_mut_ptr());
free(buf_start as *mut libc::c_void); free(buf_start as *mut libc::c_void);
} }