Mirrors/libyaml-safer
2
0
Fork 0
mirror of https://github.com/simonask/libyaml-safer synced 2024-12-02 08:09:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Factor out NULL_STRING macro

Browse source
This commit is contained in:
David Tolnay 2022-07-21 22:17:34 -07:00
parent ee0a40afc5
commit 2790c71a35
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
2 changed files with 25 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/macros.rs
View file

@ -1,3 +1,13 @@
macro_rules! NULL_STRING {
() => {
yaml_string_t {
start: ptr::null_mut::<yaml_char_t>(),
end: ptr::null_mut::<yaml_char_t>(),
pointer: ptr::null_mut::<yaml_char_t>(),
}
};
}
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

90
src/scanner.rs
View file

@ -1850,11 +1850,7 @@ unsafe fn yaml_parser_scan_directive_name(
name: *mut *mut yaml_char_t, name: *mut *mut yaml_char_t,
) -> libc::c_int { ) -> libc::c_int {
let current_block: u64; let current_block: u64;
let mut string = yaml_string_t { let mut string = NULL_STRING!();
start: ptr::null_mut::<yaml_char_t>(),
end: ptr::null_mut::<yaml_char_t>(),
pointer: ptr::null_mut::<yaml_char_t>(),
};
string.start = yaml_malloc(16_u64) as *mut yaml_char_t; string.start = yaml_malloc(16_u64) as *mut yaml_char_t;
if !(if !string.start.is_null() { if !(if !string.start.is_null() {
string.pointer = string.start; string.pointer = string.start;
@ -2115,11 +2111,7 @@ unsafe fn yaml_parser_scan_anchor(
let mut length: libc::c_int = 0_i32; let mut length: libc::c_int = 0_i32;
let start_mark: yaml_mark_t; let start_mark: yaml_mark_t;
let end_mark: yaml_mark_t; let end_mark: yaml_mark_t;
let mut string = yaml_string_t { let mut string = NULL_STRING!();
start: ptr::null_mut::<yaml_char_t>(),
end: ptr::null_mut::<yaml_char_t>(),
pointer: ptr::null_mut::<yaml_char_t>(),
};
string.start = yaml_malloc(16_u64) as *mut yaml_char_t; string.start = yaml_malloc(16_u64) as *mut yaml_char_t;
if !(if !string.start.is_null() { if !(if !string.start.is_null() {
string.pointer = string.start; string.pointer = string.start;
@ -2389,11 +2381,7 @@ unsafe fn yaml_parser_scan_tag_handle(
handle: *mut *mut yaml_char_t, handle: *mut *mut yaml_char_t,
) -> libc::c_int { ) -> libc::c_int {
let mut current_block: u64; let mut current_block: u64;
let mut string = yaml_string_t { let mut string = NULL_STRING!();
start: ptr::null_mut::<yaml_char_t>(),
end: ptr::null_mut::<yaml_char_t>(),
pointer: ptr::null_mut::<yaml_char_t>(),
};
string.start = yaml_malloc(16_u64) as *mut yaml_char_t; string.start = yaml_malloc(16_u64) as *mut yaml_char_t;
if !(if !string.start.is_null() { if !(if !string.start.is_null() {
string.pointer = string.start; string.pointer = string.start;
@ -2511,11 +2499,7 @@ unsafe fn yaml_parser_scan_tag_uri(
} else { } else {
0_u64 0_u64
}; };
let mut string = yaml_string_t { let mut string = NULL_STRING!();
start: ptr::null_mut::<yaml_char_t>(),
end: ptr::null_mut::<yaml_char_t>(),
pointer: ptr::null_mut::<yaml_char_t>(),
};
string.start = yaml_malloc(16_u64) as *mut yaml_char_t; string.start = yaml_malloc(16_u64) as *mut yaml_char_t;
if if !string.start.is_null() { if if !string.start.is_null() {
string.pointer = string.start; string.pointer = string.start;
@ -2850,21 +2834,9 @@ unsafe fn yaml_parser_scan_block_scalar(
let mut current_block: u64; let mut current_block: u64;
let start_mark: yaml_mark_t; let start_mark: yaml_mark_t;
let mut end_mark: yaml_mark_t; let mut end_mark: yaml_mark_t;
let mut string = yaml_string_t { let mut string = NULL_STRING!();
start: ptr::null_mut::<yaml_char_t>(), let mut leading_break = NULL_STRING!();
end: ptr::null_mut::<yaml_char_t>(), let mut trailing_breaks = NULL_STRING!();
pointer: ptr::null_mut::<yaml_char_t>(),
};
let mut leading_break = yaml_string_t {
start: ptr::null_mut::<yaml_char_t>(),
end: ptr::null_mut::<yaml_char_t>(),
pointer: ptr::null_mut::<yaml_char_t>(),
};
let mut trailing_breaks = yaml_string_t {
start: ptr::null_mut::<yaml_char_t>(),
end: ptr::null_mut::<yaml_char_t>(),
pointer: ptr::null_mut::<yaml_char_t>(),
};
let mut chomping: libc::c_int = 0_i32; let mut chomping: libc::c_int = 0_i32;
let mut increment: libc::c_int = 0_i32; let mut increment: libc::c_int = 0_i32;
let mut indent: libc::c_int = 0_i32; let mut indent: libc::c_int = 0_i32;
@ -3551,26 +3523,10 @@ unsafe fn yaml_parser_scan_flow_scalar(
let current_block: u64; let current_block: u64;
let start_mark: yaml_mark_t; let start_mark: yaml_mark_t;
let end_mark: yaml_mark_t; let end_mark: yaml_mark_t;
let mut string = yaml_string_t { let mut string = NULL_STRING!();
start: ptr::null_mut::<yaml_char_t>(), let mut leading_break = NULL_STRING!();
end: ptr::null_mut::<yaml_char_t>(), let mut trailing_breaks = NULL_STRING!();
pointer: ptr::null_mut::<yaml_char_t>(), let mut whitespaces = NULL_STRING!();
};
let mut leading_break = yaml_string_t {
start: ptr::null_mut::<yaml_char_t>(),
end: ptr::null_mut::<yaml_char_t>(),
pointer: ptr::null_mut::<yaml_char_t>(),
};
let mut trailing_breaks = yaml_string_t {
start: ptr::null_mut::<yaml_char_t>(),
end: ptr::null_mut::<yaml_char_t>(),
pointer: ptr::null_mut::<yaml_char_t>(),
};
let mut whitespaces = yaml_string_t {
start: ptr::null_mut::<yaml_char_t>(),
end: ptr::null_mut::<yaml_char_t>(),
pointer: ptr::null_mut::<yaml_char_t>(),
};
let mut leading_blanks: libc::c_int; let mut leading_blanks: libc::c_int;
string.start = yaml_malloc(16_u64) as *mut yaml_char_t; string.start = yaml_malloc(16_u64) as *mut yaml_char_t;
if !(if !string.start.is_null() { if !(if !string.start.is_null() {
@ -4407,26 +4363,10 @@ unsafe fn yaml_parser_scan_plain_scalar(
let current_block: u64; let current_block: u64;
let start_mark: yaml_mark_t; let start_mark: yaml_mark_t;
let mut end_mark: yaml_mark_t; let mut end_mark: yaml_mark_t;
let mut string = yaml_string_t { let mut string = NULL_STRING!();
start: ptr::null_mut::<yaml_char_t>(), let mut leading_break = NULL_STRING!();
end: ptr::null_mut::<yaml_char_t>(), let mut trailing_breaks = NULL_STRING!();
pointer: ptr::null_mut::<yaml_char_t>(), let mut whitespaces = NULL_STRING!();
};
let mut leading_break = yaml_string_t {
start: ptr::null_mut::<yaml_char_t>(),
end: ptr::null_mut::<yaml_char_t>(),
pointer: ptr::null_mut::<yaml_char_t>(),
};
let mut trailing_breaks = yaml_string_t {
start: ptr::null_mut::<yaml_char_t>(),
end: ptr::null_mut::<yaml_char_t>(),
pointer: ptr::null_mut::<yaml_char_t>(),
};
let mut whitespaces = yaml_string_t {
start: ptr::null_mut::<yaml_char_t>(),
end: ptr::null_mut::<yaml_char_t>(),
pointer: ptr::null_mut::<yaml_char_t>(),
};
let mut leading_blanks: libc::c_int = 0_i32; let mut leading_blanks: libc::c_int = 0_i32;
let indent: libc::c_int = (*parser).indent + 1_i32; let indent: libc::c_int = (*parser).indent + 1_i32;
string.start = yaml_malloc(16_u64) as *mut yaml_char_t; string.start = yaml_malloc(16_u64) as *mut yaml_char_t;