Mirrors/libyaml-safer
2
0
Fork 0
mirror of https://github.com/simonask/libyaml-safer synced 2025-02-17 04:48:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Factor out CLEAR macro

Browse source
This commit is contained in:
David Tolnay 2022-07-21 23:19:26 -07:00
parent 0f5f82d78e
commit b32d498737
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
2 changed files with 26 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/macros.rs
View file

@ -90,6 +90,17 @@ macro_rules! STRING_EXTEND {
}; };
} }
macro_rules! CLEAR {
($string:expr) => {{
$string.pointer = $string.start;
memset(
$string.start as *mut libc::c_void,
0_i32,
$string.end.c_offset_from($string.start) as libc::c_ulong,
);
}};
}
macro_rules! IS_BLANK_AT { macro_rules! IS_BLANK_AT {
($string:expr, $offset:expr) => { ($string:expr, $offset:expr) => {
*$string.pointer.wrapping_offset($offset as isize) as libc::c_int *$string.pointer.wrapping_offset($offset as isize) as libc::c_int

136
src/scanner.rs
View file

@ -3044,13 +3044,7 @@ unsafe fn yaml_parser_scan_block_scalar(
string.pointer = string.pointer.wrapping_offset(1); string.pointer = string.pointer.wrapping_offset(1);
*fresh418 = ' ' as i32 as yaml_char_t; *fresh418 = ' ' as i32 as yaml_char_t;
} }
leading_break.pointer = leading_break.start; CLEAR!(leading_break);
memset(
leading_break.start as *mut libc::c_void,
0_i32,
leading_break.end.c_offset_from(leading_break.start)
as libc::c_long as libc::c_ulong,
);
} else { } else {
if if yaml_string_join( if if yaml_string_join(
addr_of_mut!(string.start), addr_of_mut!(string.start),
@ -3071,13 +3065,7 @@ unsafe fn yaml_parser_scan_block_scalar(
current_block = 14984465786483313892; current_block = 14984465786483313892;
break; break;
} }
leading_break.pointer = leading_break.start; CLEAR!(leading_break);
memset(
leading_break.start as *mut libc::c_void,
0_i32,
leading_break.end.c_offset_from(leading_break.start)
as libc::c_long as libc::c_ulong,
);
} }
if if yaml_string_join( if if yaml_string_join(
addr_of_mut!(string.start), addr_of_mut!(string.start),
@ -3098,13 +3086,7 @@ unsafe fn yaml_parser_scan_block_scalar(
current_block = 14984465786483313892; current_block = 14984465786483313892;
break; break;
} }
trailing_breaks.pointer = trailing_breaks.start; CLEAR!(trailing_breaks);
memset(
trailing_breaks.start as *mut libc::c_void,
0_i32,
trailing_breaks.end.c_offset_from(trailing_breaks.start)
as libc::c_long as libc::c_ulong,
);
leading_blank = IS_BLANK!((*parser).buffer) as libc::c_int; leading_blank = IS_BLANK!((*parser).buffer) as libc::c_int;
while !(*((*parser).buffer.pointer) while !(*((*parser).buffer.pointer)
as libc::c_int as libc::c_int
@ -3904,14 +3886,7 @@ unsafe fn yaml_parser_scan_flow_scalar(
break 's_58; break 's_58;
} }
if leading_blanks == 0 { if leading_blanks == 0 {
whitespaces.pointer = whitespaces.start; CLEAR!(whitespaces);
memset(
whitespaces.start as *mut libc::c_void,
0_i32,
whitespaces.end.c_offset_from(whitespaces.start)
as libc::c_long
as libc::c_ulong,
);
if READ_LINE!(parser, leading_break) == 0 { if READ_LINE!(parser, leading_break) == 0 {
current_block = 8114179180390253173; current_block = 8114179180390253173;
break 's_58; break 's_58;
@ -3957,24 +3932,9 @@ unsafe fn yaml_parser_scan_flow_scalar(
current_block = 8114179180390253173; current_block = 8114179180390253173;
break; break;
} }
trailing_breaks.pointer = trailing_breaks.start; CLEAR!(trailing_breaks);
memset(
trailing_breaks.start as *mut libc::c_void,
0_i32,
(trailing_breaks.end)
.c_offset_from(trailing_breaks.start)
as libc::c_long
as libc::c_ulong,
);
} }
leading_break.pointer = leading_break.start; CLEAR!(leading_break);
memset(
leading_break.start as *mut libc::c_void,
0_i32,
leading_break.end.c_offset_from(leading_break.start)
as libc::c_long
as libc::c_ulong,
);
} else { } else {
if if yaml_string_join( if if yaml_string_join(
addr_of_mut!(string.start), addr_of_mut!(string.start),
@ -4014,22 +3974,8 @@ unsafe fn yaml_parser_scan_flow_scalar(
current_block = 8114179180390253173; current_block = 8114179180390253173;
break; break;
} }
leading_break.pointer = leading_break.start; CLEAR!(leading_break);
memset( CLEAR!(trailing_breaks);
leading_break.start as *mut libc::c_void,
0_i32,
leading_break.end.c_offset_from(leading_break.start)
as libc::c_long
as libc::c_ulong,
);
trailing_breaks.pointer = trailing_breaks.start;
memset(
trailing_breaks.start as *mut libc::c_void,
0_i32,
trailing_breaks.end.c_offset_from(trailing_breaks.start)
as libc::c_long
as libc::c_ulong,
);
} }
} else { } else {
if if yaml_string_join( if if yaml_string_join(
@ -4051,13 +3997,7 @@ unsafe fn yaml_parser_scan_flow_scalar(
current_block = 8114179180390253173; current_block = 8114179180390253173;
break; break;
} }
whitespaces.pointer = whitespaces.start; CLEAR!(whitespaces);
memset(
whitespaces.start as *mut libc::c_void,
0_i32,
whitespaces.end.c_offset_from(whitespaces.start) as libc::c_long
as libc::c_ulong,
);
} }
} }
} }
@ -4235,25 +4175,9 @@ unsafe fn yaml_parser_scan_plain_scalar(
current_block = 16642808987012640029; current_block = 16642808987012640029;
break 's_57; break 's_57;
} }
trailing_breaks.pointer = trailing_breaks.start; CLEAR!(trailing_breaks);
memset(
trailing_breaks.start as *mut libc::c_void,
0_i32,
(trailing_breaks.end)
.c_offset_from(trailing_breaks.start)
as libc::c_long
as libc::c_ulong,
);
} }
leading_break.pointer = leading_break.start; CLEAR!(leading_break);
memset(
leading_break.start as *mut libc::c_void,
0_i32,
(leading_break.end)
.c_offset_from(leading_break.start)
as libc::c_long
as libc::c_ulong,
);
} else { } else {
if if yaml_string_join( if if yaml_string_join(
addr_of_mut!(string.start), addr_of_mut!(string.start),
@ -4293,24 +4217,8 @@ unsafe fn yaml_parser_scan_plain_scalar(
current_block = 16642808987012640029; current_block = 16642808987012640029;
break 's_57; break 's_57;
} }
leading_break.pointer = leading_break.start; CLEAR!(leading_break);
memset( CLEAR!(trailing_breaks);
leading_break.start as *mut libc::c_void,
0_i32,
(leading_break.end)
.c_offset_from(leading_break.start)
as libc::c_long
as libc::c_ulong,
);
trailing_breaks.pointer = trailing_breaks.start;
memset(
trailing_breaks.start as *mut libc::c_void,
0_i32,
(trailing_breaks.end)
.c_offset_from(trailing_breaks.start)
as libc::c_long
as libc::c_ulong,
);
} }
leading_blanks = 0_i32; leading_blanks = 0_i32;
} else { } else {
@ -4333,14 +4241,7 @@ unsafe fn yaml_parser_scan_plain_scalar(
current_block = 16642808987012640029; current_block = 16642808987012640029;
break 's_57; break 's_57;
} }
whitespaces.pointer = whitespaces.start; CLEAR!(whitespaces);
memset(
whitespaces.start as *mut libc::c_void,
0_i32,
whitespaces.end.c_offset_from(whitespaces.start)
as libc::c_long
as libc::c_ulong,
);
} }
} }
if READ!(parser, string) == 0 { if READ!(parser, string) == 0 {
@ -4446,14 +4347,7 @@ unsafe fn yaml_parser_scan_plain_scalar(
break 's_57; break 's_57;
} }
if leading_blanks == 0 { if leading_blanks == 0 {
whitespaces.pointer = whitespaces.start; CLEAR!(whitespaces);
memset(
whitespaces.start as *mut libc::c_void,
0_i32,
whitespaces.end.c_offset_from(whitespaces.start)
as libc::c_long
as libc::c_ulong,
);
if READ_LINE!(parser, leading_break) == 0 { if READ_LINE!(parser, leading_break) == 0 {
current_block = 16642808987012640029; current_block = 16642808987012640029;
break 's_57; break 's_57;