Mirrors/libyaml-safer
2
0
Fork 0
mirror of https://github.com/simonask/libyaml-safer synced 2024-11-27 05:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace NULL_STRING macro with const

Browse source
This commit is contained in:
David Tolnay 2022-07-22 22:22:20 -07:00
parent e245fc53a8
commit c5de022daa
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
3 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/macros.rs
View file

@ -29,16 +29,6 @@ macro_rules! BUFFER_DEL {
}}; }};
} }
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! STRING_ASSIGN { macro_rules! STRING_ASSIGN {
($string:expr, $length:expr) => { ($string:expr, $length:expr) => {
yaml_string_t { yaml_string_t {

32
src/scanner.rs
View file

@ -4,7 +4,7 @@ use crate::api::{
}; };
use crate::externs::{memcpy, memmove, memset, strcmp, strlen}; use crate::externs::{memcpy, memmove, memset, strcmp, strlen};
use crate::reader::yaml_parser_update_buffer; use crate::reader::yaml_parser_update_buffer;
use crate::yaml::{ptrdiff_t, size_t, yaml_char_t, yaml_string_t}; use crate::yaml::{ptrdiff_t, size_t, yaml_char_t, yaml_string_t, NULL_STRING};
use crate::{ use crate::{
libc, yaml_mark_t, yaml_parser_t, yaml_simple_key_t, yaml_token_delete, yaml_token_t, libc, yaml_mark_t, yaml_parser_t, yaml_simple_key_t, yaml_token_delete, yaml_token_t,
yaml_token_type_t, PointerExt, YAML_ALIAS_TOKEN, YAML_ANCHOR_TOKEN, YAML_BLOCK_END_TOKEN, yaml_token_type_t, PointerExt, YAML_ALIAS_TOKEN, YAML_ANCHOR_TOKEN, YAML_BLOCK_END_TOKEN,
@ -1225,7 +1225,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 = NULL_STRING!(); let mut string = NULL_STRING;
if !(STRING_INIT!(parser, string) == 0) { if !(STRING_INIT!(parser, string) == 0) {
if !(CACHE!(parser, 1_u64) == 0) { if !(CACHE!(parser, 1_u64) == 0) {
loop { loop {
@ -1455,7 +1455,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 = NULL_STRING!(); let mut string = NULL_STRING;
if !(STRING_INIT!(parser, string) == 0) { if !(STRING_INIT!(parser, string) == 0) {
start_mark = (*parser).mark; start_mark = (*parser).mark;
SKIP!(parser); SKIP!(parser);
@ -1683,7 +1683,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 = NULL_STRING!(); let mut string = NULL_STRING;
if !(STRING_INIT!(parser, string) == 0) { if !(STRING_INIT!(parser, string) == 0) {
if !(CACHE!(parser, 1_u64) == 0) { if !(CACHE!(parser, 1_u64) == 0) {
if !CHECK!((*parser).buffer, b'!') { if !CHECK!((*parser).buffer, b'!') {
@ -1770,7 +1770,7 @@ unsafe fn yaml_parser_scan_tag_uri(
} else { } else {
0_u64 0_u64
}; };
let mut string = NULL_STRING!(); let mut string = NULL_STRING;
if STRING_INIT!(parser, string) == 0 { if STRING_INIT!(parser, string) == 0 {
current_block = 15265153392498847348; current_block = 15265153392498847348;
} else { } else {
@ -1972,9 +1972,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 = NULL_STRING!(); let mut string = NULL_STRING;
let mut leading_break = NULL_STRING!(); let mut leading_break = NULL_STRING;
let mut trailing_breaks = NULL_STRING!(); let mut trailing_breaks = NULL_STRING;
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;
@ -2335,10 +2335,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 = NULL_STRING!(); let mut string = NULL_STRING;
let mut leading_break = NULL_STRING!(); let mut leading_break = NULL_STRING;
let mut trailing_breaks = NULL_STRING!(); let mut trailing_breaks = NULL_STRING;
let mut whitespaces = NULL_STRING!(); let mut whitespaces = NULL_STRING;
let mut leading_blanks: libc::c_int; let mut leading_blanks: libc::c_int;
if !(STRING_INIT!(parser, string) == 0) { if !(STRING_INIT!(parser, string) == 0) {
if !(STRING_INIT!(parser, leading_break) == 0) { if !(STRING_INIT!(parser, leading_break) == 0) {
@ -2827,10 +2827,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 = NULL_STRING!(); let mut string = NULL_STRING;
let mut leading_break = NULL_STRING!(); let mut leading_break = NULL_STRING;
let mut trailing_breaks = NULL_STRING!(); let mut trailing_breaks = NULL_STRING;
let mut whitespaces = NULL_STRING!(); let mut whitespaces = NULL_STRING;
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;
if !(STRING_INIT!(parser, string) == 0) { if !(STRING_INIT!(parser, string) == 0) {

8
src/yaml.rs
View file

@ -1,6 +1,6 @@
use crate::libc; use crate::libc;
use core::ops::Deref; use core::ops::Deref;
use core::ptr::addr_of; use core::ptr::{self, addr_of};
pub use self::{ pub use self::{
yaml_break_t::*, yaml_emitter_state_t::*, yaml_encoding_t::*, yaml_error_type_t::*, yaml_break_t::*, yaml_emitter_state_t::*, yaml_encoding_t::*, yaml_error_type_t::*,
@ -1222,6 +1222,12 @@ pub(crate) struct yaml_string_t {
pub pointer: *mut yaml_char_t, pub pointer: *mut yaml_char_t,
} }
pub(crate) const NULL_STRING: yaml_string_t = yaml_string_t {
start: ptr::null_mut::<yaml_char_t>(),
end: ptr::null_mut::<yaml_char_t>(),
pointer: ptr::null_mut::<yaml_char_t>(),
};
#[repr(C)] #[repr(C)]
pub(crate) struct yaml_buffer_t<T> { pub(crate) struct yaml_buffer_t<T> {
/// The beginning of the buffer. /// The beginning of the buffer.