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

Resolve unused_assignments lints

Browse source
This commit is contained in:
David Tolnay 2022-07-06 19:06:08 -07:00
parent 0a488e3b4b
commit 14ef08e7b6
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
11 changed files with 125 additions and 265 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/api.rs
View file

@ -116,7 +116,7 @@ pub unsafe extern "C" fn yaml_stack_extend(
top: *mut *mut libc::c_void,
end: *mut *mut libc::c_void,
) -> libc::c_int {
let mut new_start: *mut libc::c_void = 0 as *mut libc::c_void;
let new_start: *mut libc::c_void;
if (*end as *mut libc::c_char).c_offset_from(*start as *mut libc::c_char) as libc::c_long
>= (2147483647 as libc::c_int / 2 as libc::c_int) as libc::c_long
{
@ -944,10 +944,10 @@ unsafe extern "C" fn yaml_check_utf8(start: *const yaml_char_t, length: size_t)
let end: *const yaml_char_t = start.c_offset(length as isize);
let mut pointer: *const yaml_char_t = start;
while pointer < end {
let mut octet: libc::c_uchar = 0;
let mut width: libc::c_uint = 0;
let mut value: libc::c_uint = 0;
let mut k: size_t = 0;
let mut octet: libc::c_uchar;
let width: libc::c_uint;
let mut value: libc::c_uint;
let mut k: size_t;
octet = *pointer.c_offset(0 as libc::c_int as isize);
width = (if octet as libc::c_int & 0x80 as libc::c_int == 0 as libc::c_int {
1 as libc::c_int
@ -1108,7 +1108,7 @@ pub unsafe extern "C" fn yaml_document_start_event_initialize(
match current_block {
1394248824506584008 => {
if tag_directives_start != tag_directives_end {
let mut tag_directive: *mut yaml_tag_directive_t = 0 as *mut yaml_tag_directive_t;
let mut tag_directive: *mut yaml_tag_directive_t;
tag_directives_copy.start =
yaml_malloc((16 as libc::c_int as libc::c_ulong).wrapping_mul(
::std::mem::size_of::<yaml_tag_directive_t>() as libc::c_ulong,
@ -1262,7 +1262,7 @@ pub unsafe extern "C" fn yaml_alias_event_initialize(
};
init
};
let mut anchor_copy: *mut yaml_char_t = 0 as *mut yaml_char_t;
let anchor_copy: *mut yaml_char_t;
__assert!(!event.is_null());
__assert!(!anchor.is_null());
if yaml_check_utf8(anchor, strlen(anchor as *mut libc::c_char)) == 0 {
@ -1588,7 +1588,7 @@ pub unsafe extern "C" fn yaml_mapping_end_event_initialize(
}
#[no_mangle]
pub unsafe extern "C" fn yaml_event_delete(event: *mut yaml_event_t) {
let mut tag_directive: *mut yaml_tag_directive_t = 0 as *mut yaml_tag_directive_t;
let mut tag_directive: *mut yaml_tag_directive_t;
__assert!(!event.is_null());
match (*event).type_0 as libc::c_uint {
3 => {
@ -1707,8 +1707,7 @@ pub unsafe extern "C" fn yaml_document_initialize(
8142820162064489797 => {}
_ => {
if tag_directives_start != tag_directives_end {
let mut tag_directive: *mut yaml_tag_directive_t =
0 as *mut yaml_tag_directive_t;
let mut tag_directive: *mut yaml_tag_directive_t;
tag_directives_copy.start =
yaml_malloc((16 as libc::c_int as libc::c_ulong).wrapping_mul(
::std::mem::size_of::<yaml_tag_directive_t>() as libc::c_ulong,
@ -1836,7 +1835,7 @@ pub unsafe extern "C" fn yaml_document_initialize(
}
#[no_mangle]
pub unsafe extern "C" fn yaml_document_delete(document: *mut yaml_document_t) {
let mut tag_directive: *mut yaml_tag_directive_t = 0 as *mut yaml_tag_directive_t;
let mut tag_directive: *mut yaml_tag_directive_t;
__assert!(!document.is_null());
while !((*document).nodes.start == (*document).nodes.top) {
let ref mut fresh182 = (*document).nodes.top;

18
src/bin/run-emitter-test-suite.rs
View file

@ -1,5 +1,3 @@
#![allow(unused_assignments)]
use std::env;
use std::ffi::CStr;
use std::fs::File;
@ -69,11 +67,11 @@ unsafe fn unsafe_main() -> ExitCode {
}
};
let line = line as *mut [u8] as *mut libc::c_char;
let mut ok: libc::c_int = 0;
let ok: libc::c_int;
let mut anchor: [libc::c_char; 256] = [0; 256];
let mut tag: [libc::c_char; 256] = [0; 256];
let mut implicit: libc::c_int = 0;
let mut style: libc::c_int = 0;
let implicit: libc::c_int;
let style: libc::c_int;
if strncmp(
line,
b"+STR\0" as *const u8 as *const libc::c_char,
@ -306,8 +304,8 @@ pub unsafe extern "C" fn get_anchor(
line: *mut libc::c_char,
anchor: *mut libc::c_char,
) -> *mut libc::c_char {
let mut start: *mut libc::c_char = ptr::null_mut::<libc::c_char>();
let mut end: *mut libc::c_char = ptr::null_mut::<libc::c_char>();
let mut start: *mut libc::c_char;
let mut end: *mut libc::c_char;
start = strchr(line, sigil as libc::c_int);
if start.is_null() {
return ptr::null_mut::<libc::c_char>();
@ -330,8 +328,8 @@ pub unsafe extern "C" fn get_tag(
line: *mut libc::c_char,
tag: *mut libc::c_char,
) -> *mut libc::c_char {
let mut start: *mut libc::c_char = ptr::null_mut::<libc::c_char>();
let mut end: *mut libc::c_char = ptr::null_mut::<libc::c_char>();
let start: *mut libc::c_char;
let end: *mut libc::c_char;
start = strchr(line, '<' as i32);
if start.is_null() {
return ptr::null_mut::<libc::c_char>();
@ -358,7 +356,7 @@ pub unsafe extern "C" fn get_value(
style: *mut libc::c_int,
) {
let mut i: libc::c_int = 0 as libc::c_int;
let mut c: *mut libc::c_char = ptr::null_mut::<libc::c_char>();
let mut c: *mut libc::c_char;
let mut start: *mut libc::c_char = ptr::null_mut::<libc::c_char>();
let end: *mut libc::c_char = line.offset(strlen(line) as isize);
let mut current_block_8: u64;

8
src/bin/run-parser-test-suite.rs
View file

@ -1,5 +1,3 @@
#![allow(unused_assignments)]
use std::cmp;
use std::env;
use std::ffi::CStr;
@ -53,7 +51,7 @@ unsafe fn unsafe_main() -> ExitCode {
ptr::addr_of_mut!(remaining).cast(),
);
loop {
let mut type_0: yaml_event_type_t = YAML_NO_EVENT;
let type_0: yaml_event_type_t;
if yaml_parser_parse(parser, event) == 0 {
let _ = writeln!(
io::stderr(),
@ -194,8 +192,8 @@ unsafe fn unsafe_main() -> ExitCode {
}
#[no_mangle]
pub unsafe extern "C" fn print_escaped(str: *mut yaml_char_t, length: size_t) {
let mut i: libc::c_int = 0;
let mut c: libc::c_char = 0;
let mut i: libc::c_int;
let mut c: libc::c_char;
i = 0 as libc::c_int;
while (i as libc::c_ulong) < length {
c = *str.offset(i as isize) as libc::c_char;

10
src/dumper.rs
View file

@ -208,7 +208,7 @@ pub unsafe extern "C" fn yaml_emitter_dump(
return 0 as libc::c_int;
}
unsafe extern "C" fn yaml_emitter_delete_document_and_anchors(mut emitter: *mut yaml_emitter_t) {
let mut index: libc::c_int = 0;
let mut index: libc::c_int;
if ((*emitter).anchors).is_null() {
yaml_document_delete((*emitter).document);
let ref mut fresh2 = (*emitter).document;
@ -258,8 +258,8 @@ unsafe extern "C" fn yaml_emitter_anchor_node(emitter: *mut yaml_emitter_t, inde
let node: *mut yaml_node_t = ((*(*emitter).document).nodes.start)
.c_offset(index as isize)
.c_offset(-(1 as libc::c_int as isize));
let mut item: *mut yaml_node_item_t = 0 as *mut yaml_node_item_t;
let mut pair: *mut yaml_node_pair_t = 0 as *mut yaml_node_pair_t;
let mut item: *mut yaml_node_item_t;
let mut pair: *mut yaml_node_pair_t;
let ref mut fresh8 =
(*((*emitter).anchors).c_offset((index - 1 as libc::c_int) as isize)).references;
*fresh8 += 1;
@ -464,7 +464,7 @@ unsafe extern "C" fn yaml_emitter_dump_sequence(
(*node).tag as *mut libc::c_char,
b"tag:yaml.org,2002:seq\0" as *const u8 as *const libc::c_char,
) == 0 as libc::c_int) as libc::c_int;
let mut item: *mut yaml_node_item_t = 0 as *mut yaml_node_item_t;
let mut item: *mut yaml_node_item_t;
memset(
&mut event as *mut yaml_event_t as *mut libc::c_void,
0 as libc::c_int,
@ -535,7 +535,7 @@ unsafe extern "C" fn yaml_emitter_dump_mapping(
(*node).tag as *mut libc::c_char,
b"tag:yaml.org,2002:map\0" as *const u8 as *const libc::c_char,
) == 0 as libc::c_int) as libc::c_int;
let mut pair: *mut yaml_node_pair_t = 0 as *mut yaml_node_pair_t;
let mut pair: *mut yaml_node_pair_t;
memset(
&mut event as *mut yaml_event_t as *mut libc::c_void,
0 as libc::c_int,

36
src/emitter.rs
View file

@ -55,8 +55,8 @@ pub unsafe extern "C" fn yaml_emitter_emit(
}
unsafe extern "C" fn yaml_emitter_need_more_events(emitter: *mut yaml_emitter_t) -> libc::c_int {
let mut level: libc::c_int = 0 as libc::c_int;
let mut accumulate: libc::c_int = 0 as libc::c_int;
let mut event: *mut yaml_event_t = 0 as *mut yaml_event_t;
let accumulate: libc::c_int;
let mut event: *mut yaml_event_t;
if (*emitter).events.head == (*emitter).events.tail {
return 1 as libc::c_int;
}
@ -100,7 +100,7 @@ unsafe extern "C" fn yaml_emitter_append_tag_directive(
value: yaml_tag_directive_t,
allow_duplicates: libc::c_int,
) -> libc::c_int {
let mut tag_directive: *mut yaml_tag_directive_t = 0 as *mut yaml_tag_directive_t;
let mut tag_directive: *mut yaml_tag_directive_t;
let mut copy: yaml_tag_directive_t = {
let init = yaml_tag_directive_s {
handle: 0 as *mut yaml_char_t,
@ -317,8 +317,8 @@ unsafe extern "C" fn yaml_emitter_emit_document_start(
init
},
];
let mut tag_directive: *mut yaml_tag_directive_t = 0 as *mut yaml_tag_directive_t;
let mut implicit: libc::c_int = 0;
let mut tag_directive: *mut yaml_tag_directive_t;
let mut implicit: libc::c_int;
if !((*event).data.document_start.version_directive).is_null() {
if yaml_emitter_analyze_version_directive(
emitter,
@ -1536,8 +1536,8 @@ unsafe extern "C" fn yaml_emitter_analyze_tag_directive(
end: 0 as *mut yaml_char_t,
pointer: 0 as *mut yaml_char_t,
};
let mut handle_length: size_t = 0;
let mut prefix_length: size_t = 0;
let handle_length: size_t;
let prefix_length: size_t;
handle_length = strlen(tag_directive.handle as *mut libc::c_char);
prefix_length = strlen(tag_directive.prefix as *mut libc::c_char);
handle.start = tag_directive.handle;
@ -1626,7 +1626,7 @@ unsafe extern "C" fn yaml_emitter_analyze_anchor(
anchor: *mut yaml_char_t,
alias: libc::c_int,
) -> libc::c_int {
let mut anchor_length: size_t = 0;
let anchor_length: size_t;
let mut string: yaml_string_t = yaml_string_t {
start: 0 as *mut yaml_char_t,
end: 0 as *mut yaml_char_t,
@ -1710,13 +1710,13 @@ unsafe extern "C" fn yaml_emitter_analyze_tag(
mut emitter: *mut yaml_emitter_t,
tag: *mut yaml_char_t,
) -> libc::c_int {
let mut tag_length: size_t = 0;
let tag_length: size_t;
let mut string: yaml_string_t = yaml_string_t {
start: 0 as *mut yaml_char_t,
end: 0 as *mut yaml_char_t,
pointer: 0 as *mut yaml_char_t,
};
let mut tag_directive: *mut yaml_tag_directive_t = 0 as *mut yaml_tag_directive_t;
let mut tag_directive: *mut yaml_tag_directive_t;
tag_length = strlen(tag as *mut libc::c_char);
string.start = tag;
string.end = tag.c_offset(tag_length as isize);
@ -1776,8 +1776,8 @@ unsafe extern "C" fn yaml_emitter_analyze_scalar(
let mut trailing_break: libc::c_int = 0 as libc::c_int;
let mut break_space: libc::c_int = 0 as libc::c_int;
let mut space_break: libc::c_int = 0 as libc::c_int;
let mut preceded_by_whitespace: libc::c_int = 0 as libc::c_int;
let mut followed_by_whitespace: libc::c_int = 0 as libc::c_int;
let mut preceded_by_whitespace: libc::c_int;
let mut followed_by_whitespace: libc::c_int;
let mut previous_space: libc::c_int = 0 as libc::c_int;
let mut previous_break: libc::c_int = 0 as libc::c_int;
string.start = value;
@ -3256,7 +3256,7 @@ unsafe extern "C" fn yaml_emitter_write_indicator(
is_whitespace: libc::c_int,
is_indention: libc::c_int,
) -> libc::c_int {
let mut indicator_length: size_t = 0;
let indicator_length: size_t;
let mut string: yaml_string_t = yaml_string_t {
start: 0 as *mut yaml_char_t,
end: 0 as *mut yaml_char_t,
@ -3804,7 +3804,7 @@ unsafe extern "C" fn yaml_emitter_write_tag_content(
} else {
0 as libc::c_int
};
let mut value_0: libc::c_uint = 0;
let mut value_0: libc::c_uint;
loop {
let fresh207 = width;
width = width - 1;
@ -4968,10 +4968,10 @@ unsafe extern "C" fn yaml_emitter_write_double_quoted_scalar(
|| *(string.pointer).c_offset(0 as libc::c_int as isize) as libc::c_int
== '\\' as i32 as yaml_char_t as libc::c_int
{
let mut octet: libc::c_uchar = 0;
let mut width: libc::c_uint = 0;
let mut value_0: libc::c_uint = 0;
let mut k: libc::c_int = 0;
let mut octet: libc::c_uchar;
let mut width: libc::c_uint;
let mut value_0: libc::c_uint;
let mut k: libc::c_int;
octet = *(string.pointer).c_offset(0 as libc::c_int as isize);
width = (if octet as libc::c_int & 0x80 as libc::c_int == 0 as libc::c_int {
1 as libc::c_int

7
src/lib.rs
View file

@ -1,9 +1,4 @@
#![allow(
non_camel_case_types,
unused_assignments,
unused_parens,
unused_variables
)]
#![allow(non_camel_case_types, unused_parens, unused_variables)]
use std::mem;

18
src/loader.rs
View file

@ -309,7 +309,7 @@ unsafe extern "C" fn yaml_parser_register_anchor(
column: 0,
},
};
let mut alias_data: *mut yaml_alias_data_t = 0 as *mut yaml_alias_data_t;
let mut alias_data: *mut yaml_alias_data_t;
if anchor.is_null() {
return 1 as libc::c_int;
}
@ -363,8 +363,8 @@ unsafe extern "C" fn yaml_parser_load_node_add(
ctx: *mut loader_ctx,
index: libc::c_int,
) -> libc::c_int {
let mut parent: *mut yaml_node_s = 0 as *mut yaml_node_s;
let mut parent_index: libc::c_int = 0;
let parent: *mut yaml_node_s;
let parent_index: libc::c_int;
if (*ctx).start == (*ctx).top {
return 1 as libc::c_int;
}
@ -479,7 +479,7 @@ unsafe extern "C" fn yaml_parser_load_alias(
ctx: *mut loader_ctx,
) -> libc::c_int {
let anchor: *mut yaml_char_t = (*event).data.alias.anchor;
let mut alias_data: *mut yaml_alias_data_t = 0 as *mut yaml_alias_data_t;
let mut alias_data: *mut yaml_alias_data_t;
alias_data = (*parser).aliases.start;
while alias_data != (*parser).aliases.top {
if strcmp(
@ -526,7 +526,7 @@ unsafe extern "C" fn yaml_parser_load_scalar(
column: 0,
},
};
let mut index: libc::c_int = 0;
let index: libc::c_int;
let mut tag: *mut yaml_char_t = (*event).data.scalar.tag;
if !(if (((*(*parser).document).nodes.top).c_offset_from((*(*parser).document).nodes.start)
as libc::c_long)
@ -643,7 +643,7 @@ unsafe extern "C" fn yaml_parser_load_sequence(
};
init
};
let mut index: libc::c_int = 0;
let index: libc::c_int;
let mut tag: *mut yaml_char_t = (*event).data.sequence_start.tag;
if !(if (((*(*parser).document).nodes.top).c_offset_from((*(*parser).document).nodes.start)
as libc::c_long)
@ -782,7 +782,7 @@ unsafe extern "C" fn yaml_parser_load_sequence_end(
event: *mut yaml_event_t,
ctx: *mut loader_ctx,
) -> libc::c_int {
let mut index: libc::c_int = 0;
let index: libc::c_int;
__assert!(
((*ctx).top).c_offset_from((*ctx).start) as libc::c_long > 0 as libc::c_int as libc::c_long
);
@ -833,7 +833,7 @@ unsafe extern "C" fn yaml_parser_load_mapping(
};
init
};
let mut index: libc::c_int = 0;
let index: libc::c_int;
let mut tag: *mut yaml_char_t = (*event).data.mapping_start.tag;
if !(if (((*(*parser).document).nodes.top).c_offset_from((*(*parser).document).nodes.start)
as libc::c_long)
@ -972,7 +972,7 @@ unsafe extern "C" fn yaml_parser_load_mapping_end(
event: *mut yaml_event_t,
ctx: *mut loader_ctx,
) -> libc::c_int {
let mut index: libc::c_int = 0;
let index: libc::c_int;
__assert!(
((*ctx).top).c_offset_from((*ctx).start) as libc::c_long > 0 as libc::c_int as libc::c_long
);

80
src/parser.rs
View file

@ -118,7 +118,7 @@ unsafe extern "C" fn yaml_parser_parse_stream_start(
mut parser: *mut yaml_parser_t,
mut event: *mut yaml_event_t,
) -> libc::c_int {
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let token: *mut yaml_token_t;
token = if (*parser).token_available != 0 || yaml_parser_fetch_more_tokens(parser) != 0 {
(*parser).tokens.head
} else {
@ -159,7 +159,7 @@ unsafe extern "C" fn yaml_parser_parse_document_start(
mut event: *mut yaml_event_t,
implicit: libc::c_int,
) -> libc::c_int {
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let mut token: *mut yaml_token_t;
let mut version_directive: *mut yaml_version_directive_t = 0 as *mut yaml_version_directive_t;
let mut tag_directives: Unnamed_35 = {
let init = Unnamed_35 {
@ -259,16 +259,8 @@ unsafe extern "C" fn yaml_parser_parse_document_start(
} else if (*token).type_0 as libc::c_uint
!= YAML_STREAM_END_TOKEN as libc::c_int as libc::c_uint
{
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let start_mark: yaml_mark_t;
let end_mark: yaml_mark_t;
start_mark = (*token).start_mark;
if yaml_parser_process_directives(
parser,
@ -338,7 +330,6 @@ unsafe extern "C" fn yaml_parser_parse_document_start(
as libc::c_int;
let ref mut fresh18 = (*parser).tokens.head;
*fresh18 = (*fresh18).c_offset(1);
version_directive = 0 as *mut yaml_version_directive_t;
tag_directives.end = 0 as *mut yaml_tag_directive_t;
tag_directives.start = tag_directives.end;
return 1 as libc::c_int;
@ -383,7 +374,7 @@ unsafe extern "C" fn yaml_parser_parse_document_content(
mut parser: *mut yaml_parser_t,
event: *mut yaml_event_t,
) -> libc::c_int {
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let token: *mut yaml_token_t;
token = if (*parser).token_available != 0 || yaml_parser_fetch_more_tokens(parser) != 0 {
(*parser).tokens.head
} else {
@ -413,17 +404,9 @@ unsafe extern "C" fn yaml_parser_parse_document_end(
mut parser: *mut yaml_parser_t,
mut event: *mut yaml_event_t,
) -> libc::c_int {
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let token: *mut yaml_token_t;
let start_mark: yaml_mark_t;
let mut end_mark: yaml_mark_t;
let mut implicit: libc::c_int = 1 as libc::c_int;
token = if (*parser).token_available != 0 || yaml_parser_fetch_more_tokens(parser) != 0 {
(*parser).tokens.head
@ -473,27 +456,19 @@ unsafe extern "C" fn yaml_parser_parse_node(
indentless_sequence: libc::c_int,
) -> libc::c_int {
let mut current_block: u64;
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let mut token: *mut yaml_token_t;
let mut anchor: *mut yaml_char_t = 0 as *mut yaml_char_t;
let mut tag_handle: *mut yaml_char_t = 0 as *mut yaml_char_t;
let mut tag_suffix: *mut yaml_char_t = 0 as *mut yaml_char_t;
let mut tag: *mut yaml_char_t = 0 as *mut yaml_char_t;
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut start_mark: yaml_mark_t;
let mut end_mark: yaml_mark_t;
let mut tag_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut implicit: libc::c_int = 0;
let implicit: libc::c_int;
token = if (*parser).token_available != 0 || yaml_parser_fetch_more_tokens(parser) != 0 {
(*parser).tokens.head
} else {
@ -641,8 +616,7 @@ unsafe extern "C" fn yaml_parser_parse_node(
tag_handle = tag_suffix;
current_block = 9437013279121998969;
} else {
let mut tag_directive: *mut yaml_tag_directive_t =
0 as *mut yaml_tag_directive_t;
let mut tag_directive: *mut yaml_tag_directive_t;
tag_directive = (*parser).tag_directives.start;
loop {
if !(tag_directive != (*parser).tag_directives.top) {
@ -934,7 +908,7 @@ unsafe extern "C" fn yaml_parser_parse_block_sequence_entry(
mut event: *mut yaml_event_t,
first: libc::c_int,
) -> libc::c_int {
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let mut token: *mut yaml_token_t;
if first != 0 {
token = if (*parser).token_available != 0 || yaml_parser_fetch_more_tokens(parser) != 0 {
(*parser).tokens.head
@ -1066,7 +1040,7 @@ unsafe extern "C" fn yaml_parser_parse_indentless_sequence_entry(
mut parser: *mut yaml_parser_t,
mut event: *mut yaml_event_t,
) -> libc::c_int {
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let mut token: *mut yaml_token_t;
token = if (*parser).token_available != 0 || yaml_parser_fetch_more_tokens(parser) != 0 {
(*parser).tokens.head
} else {
@ -1146,7 +1120,7 @@ unsafe extern "C" fn yaml_parser_parse_block_mapping_key(
mut event: *mut yaml_event_t,
first: libc::c_int,
) -> libc::c_int {
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let mut token: *mut yaml_token_t;
if first != 0 {
token = if (*parser).token_available != 0 || yaml_parser_fetch_more_tokens(parser) != 0 {
(*parser).tokens.head
@ -1279,7 +1253,7 @@ unsafe extern "C" fn yaml_parser_parse_block_mapping_value(
mut parser: *mut yaml_parser_t,
event: *mut yaml_event_t,
) -> libc::c_int {
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let mut token: *mut yaml_token_t;
token = if (*parser).token_available != 0 || yaml_parser_fetch_more_tokens(parser) != 0 {
(*parser).tokens.head
} else {
@ -1348,7 +1322,7 @@ unsafe extern "C" fn yaml_parser_parse_flow_sequence_entry(
mut event: *mut yaml_event_t,
first: libc::c_int,
) -> libc::c_int {
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let mut token: *mut yaml_token_t;
if first != 0 {
token = if (*parser).token_available != 0 || yaml_parser_fetch_more_tokens(parser) != 0 {
(*parser).tokens.head
@ -1510,7 +1484,7 @@ unsafe extern "C" fn yaml_parser_parse_flow_sequence_entry_mapping_key(
mut parser: *mut yaml_parser_t,
event: *mut yaml_event_t,
) -> libc::c_int {
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let token: *mut yaml_token_t;
token = if (*parser).token_available != 0 || yaml_parser_fetch_more_tokens(parser) != 0 {
(*parser).tokens.head
} else {
@ -1565,7 +1539,7 @@ unsafe extern "C" fn yaml_parser_parse_flow_sequence_entry_mapping_value(
mut parser: *mut yaml_parser_t,
event: *mut yaml_event_t,
) -> libc::c_int {
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let mut token: *mut yaml_token_t;
token = if (*parser).token_available != 0 || yaml_parser_fetch_more_tokens(parser) != 0 {
(*parser).tokens.head
} else {
@ -1627,7 +1601,7 @@ unsafe extern "C" fn yaml_parser_parse_flow_sequence_entry_mapping_end(
mut parser: *mut yaml_parser_t,
mut event: *mut yaml_event_t,
) -> libc::c_int {
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let token: *mut yaml_token_t;
token = if (*parser).token_available != 0 || yaml_parser_fetch_more_tokens(parser) != 0 {
(*parser).tokens.head
} else {
@ -1652,7 +1626,7 @@ unsafe extern "C" fn yaml_parser_parse_flow_mapping_key(
mut event: *mut yaml_event_t,
first: libc::c_int,
) -> libc::c_int {
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let mut token: *mut yaml_token_t;
if first != 0 {
token = if (*parser).token_available != 0 || yaml_parser_fetch_more_tokens(parser) != 0 {
(*parser).tokens.head
@ -1840,7 +1814,7 @@ unsafe extern "C" fn yaml_parser_parse_flow_mapping_value(
event: *mut yaml_event_t,
empty: libc::c_int,
) -> libc::c_int {
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let mut token: *mut yaml_token_t;
token = if (*parser).token_available != 0 || yaml_parser_fetch_more_tokens(parser) != 0 {
(*parser).tokens.head
} else {
@ -1907,7 +1881,7 @@ unsafe extern "C" fn yaml_parser_process_empty_scalar(
mut event: *mut yaml_event_t,
mark: yaml_mark_t,
) -> libc::c_int {
let mut value: *mut yaml_char_t = 0 as *mut yaml_char_t;
let value: *mut yaml_char_t;
value = yaml_malloc(1 as libc::c_int as size_t) as *mut yaml_char_t;
if value.is_null() {
(*parser).error = YAML_MEMORY_ERROR;
@ -1965,7 +1939,7 @@ unsafe extern "C" fn yaml_parser_process_directives(
init
},
];
let mut default_tag_directive: *mut yaml_tag_directive_t = 0 as *mut yaml_tag_directive_t;
let mut default_tag_directive: *mut yaml_tag_directive_t;
let mut version_directive: *mut yaml_version_directive_t = 0 as *mut yaml_version_directive_t;
let mut tag_directives: Unnamed_36 = {
let init = Unnamed_36 {
@ -1975,7 +1949,7 @@ unsafe extern "C" fn yaml_parser_process_directives(
};
init
};
let mut token: *mut yaml_token_t = 0 as *mut yaml_token_t;
let mut token: *mut yaml_token_t;
tag_directives.start = yaml_malloc(
(16 as libc::c_int as libc::c_ulong)
.wrapping_mul(::std::mem::size_of::<yaml_tag_directive_t>() as libc::c_ulong),
@ -2178,7 +2152,7 @@ unsafe extern "C" fn yaml_parser_append_tag_directive(
allow_duplicates: libc::c_int,
mark: yaml_mark_t,
) -> libc::c_int {
let mut tag_directive: *mut yaml_tag_directive_t = 0 as *mut yaml_tag_directive_t;
let mut tag_directive: *mut yaml_tag_directive_t;
let mut copy: yaml_tag_directive_t = {
let init = yaml_tag_directive_s {
handle: 0 as *mut yaml_char_t,

10
src/reader.rs
View file

@ -169,13 +169,13 @@ pub unsafe extern "C" fn yaml_parser_update_buffer(
first = 0 as libc::c_int;
while (*parser).raw_buffer.pointer != (*parser).raw_buffer.last {
let mut value: libc::c_uint = 0 as libc::c_int as libc::c_uint;
let mut value2: libc::c_uint = 0 as libc::c_int as libc::c_uint;
let value2: libc::c_uint;
let mut incomplete: libc::c_int = 0 as libc::c_int;
let mut octet: libc::c_uchar = 0;
let mut octet: libc::c_uchar;
let mut width: libc::c_uint = 0 as libc::c_int as libc::c_uint;
let mut low: libc::c_int = 0;
let mut high: libc::c_int = 0;
let mut k: size_t = 0;
let low: libc::c_int;
let high: libc::c_int;
let mut k: size_t;
let raw_unread: size_t = ((*parser).raw_buffer.last)
.c_offset_from((*parser).raw_buffer.pointer)
as libc::c_long as size_t;

170
src/scanner.rs
View file

@ -58,13 +58,13 @@ unsafe extern "C" fn yaml_parser_set_scanner_error(
pub unsafe extern "C" fn yaml_parser_fetch_more_tokens(
mut parser: *mut yaml_parser_t,
) -> libc::c_int {
let mut need_more_tokens: libc::c_int = 0;
let mut need_more_tokens: libc::c_int;
loop {
need_more_tokens = 0 as libc::c_int;
if (*parser).tokens.head == (*parser).tokens.tail {
need_more_tokens = 1 as libc::c_int;
} else {
let mut simple_key: *mut yaml_simple_key_t = 0 as *mut yaml_simple_key_t;
let mut simple_key: *mut yaml_simple_key_t;
if yaml_parser_stale_simple_keys(parser) == 0 {
return 0 as libc::c_int;
}
@ -558,7 +558,7 @@ unsafe extern "C" fn yaml_parser_fetch_next_token(parser: *mut yaml_parser_t) ->
);
}
unsafe extern "C" fn yaml_parser_stale_simple_keys(parser: *mut yaml_parser_t) -> libc::c_int {
let mut simple_key: *mut yaml_simple_key_t = 0 as *mut yaml_simple_key_t;
let mut simple_key: *mut yaml_simple_key_t;
simple_key = (*parser).simple_keys.start;
while simple_key != (*parser).simple_keys.top {
if (*simple_key).possible != 0
@ -1066,16 +1066,8 @@ unsafe extern "C" fn yaml_parser_fetch_document_indicator(
mut parser: *mut yaml_parser_t,
type_0: yaml_token_type_t,
) -> libc::c_int {
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let start_mark: yaml_mark_t;
let end_mark: yaml_mark_t;
let mut token: yaml_token_t = yaml_token_t {
type_0: YAML_NO_TOKEN,
data: unnamed_yaml_token_s_data {
@ -1254,16 +1246,8 @@ unsafe extern "C" fn yaml_parser_fetch_flow_collection_start(
mut parser: *mut yaml_parser_t,
type_0: yaml_token_type_t,
) -> libc::c_int {
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let start_mark: yaml_mark_t;
let end_mark: yaml_mark_t;
let mut token: yaml_token_t = yaml_token_t {
type_0: YAML_NO_TOKEN,
data: unnamed_yaml_token_s_data {
@ -1364,16 +1348,8 @@ unsafe extern "C" fn yaml_parser_fetch_flow_collection_end(
mut parser: *mut yaml_parser_t,
type_0: yaml_token_type_t,
) -> libc::c_int {
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let start_mark: yaml_mark_t;
let end_mark: yaml_mark_t;
let mut token: yaml_token_t = yaml_token_t {
type_0: YAML_NO_TOKEN,
data: unnamed_yaml_token_s_data {
@ -1471,16 +1447,8 @@ unsafe extern "C" fn yaml_parser_fetch_flow_collection_end(
return 1 as libc::c_int;
}
unsafe extern "C" fn yaml_parser_fetch_flow_entry(mut parser: *mut yaml_parser_t) -> libc::c_int {
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let start_mark: yaml_mark_t;
let end_mark: yaml_mark_t;
let mut token: yaml_token_t = yaml_token_t {
type_0: YAML_NO_TOKEN,
data: unnamed_yaml_token_s_data {
@ -1575,16 +1543,8 @@ unsafe extern "C" fn yaml_parser_fetch_flow_entry(mut parser: *mut yaml_parser_t
return 1 as libc::c_int;
}
unsafe extern "C" fn yaml_parser_fetch_block_entry(mut parser: *mut yaml_parser_t) -> libc::c_int {
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let start_mark: yaml_mark_t;
let end_mark: yaml_mark_t;
let mut token: yaml_token_t = yaml_token_t {
type_0: YAML_NO_TOKEN,
data: unnamed_yaml_token_s_data {
@ -1700,16 +1660,8 @@ unsafe extern "C" fn yaml_parser_fetch_block_entry(mut parser: *mut yaml_parser_
return 1 as libc::c_int;
}
unsafe extern "C" fn yaml_parser_fetch_key(mut parser: *mut yaml_parser_t) -> libc::c_int {
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let start_mark: yaml_mark_t;
let end_mark: yaml_mark_t;
let mut token: yaml_token_t = yaml_token_t {
type_0: YAML_NO_TOKEN,
data: unnamed_yaml_token_s_data {
@ -1825,16 +1777,8 @@ unsafe extern "C" fn yaml_parser_fetch_key(mut parser: *mut yaml_parser_t) -> li
return 1 as libc::c_int;
}
unsafe extern "C" fn yaml_parser_fetch_value(mut parser: *mut yaml_parser_t) -> libc::c_int {
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let start_mark: yaml_mark_t;
let end_mark: yaml_mark_t;
let mut token: yaml_token_t = yaml_token_t {
type_0: YAML_NO_TOKEN,
data: unnamed_yaml_token_s_data {
@ -2625,16 +2569,8 @@ unsafe extern "C" fn yaml_parser_scan_directive(
mut token: *mut yaml_token_t,
) -> libc::c_int {
let mut current_block: u64;
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let start_mark: yaml_mark_t;
let end_mark: yaml_mark_t;
let mut name: *mut yaml_char_t = 0 as *mut yaml_char_t;
let mut major: libc::c_int = 0;
let mut minor: libc::c_int = 0;
@ -3990,16 +3926,8 @@ unsafe extern "C" fn yaml_parser_scan_anchor(
) -> libc::c_int {
let current_block: u64;
let mut length: libc::c_int = 0 as libc::c_int;
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let start_mark: yaml_mark_t;
let end_mark: yaml_mark_t;
let mut string: yaml_string_t = {
let init = yaml_string_t {
start: 0 as *mut yaml_char_t,
@ -4345,16 +4273,8 @@ unsafe extern "C" fn yaml_parser_scan_tag(
let mut current_block: u64;
let mut handle: *mut yaml_char_t = 0 as *mut yaml_char_t;
let mut suffix: *mut yaml_char_t = 0 as *mut yaml_char_t;
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let start_mark: yaml_mark_t;
let end_mark: yaml_mark_t;
start_mark = (*parser).mark;
if !(if (*parser).unread >= 2 as libc::c_int as libc::c_ulong {
1 as libc::c_int
@ -5501,7 +5421,7 @@ unsafe extern "C" fn yaml_parser_scan_uri_escapes(
) -> libc::c_int {
let mut width: libc::c_int = 0 as libc::c_int;
loop {
let mut octet: libc::c_uchar = 0 as libc::c_int as libc::c_uchar;
let octet: libc::c_uchar;
if if (*parser).unread >= 3 as libc::c_int as libc::c_ulong {
1 as libc::c_int
} else {
@ -5770,16 +5690,8 @@ unsafe extern "C" fn yaml_parser_scan_block_scalar(
literal: libc::c_int,
) -> libc::c_int {
let mut current_block: u64;
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let start_mark: yaml_mark_t;
let mut end_mark: yaml_mark_t;
let mut string: yaml_string_t = {
let init = yaml_string_t {
start: 0 as *mut yaml_char_t,
@ -5808,7 +5720,7 @@ unsafe extern "C" fn yaml_parser_scan_block_scalar(
let mut increment: libc::c_int = 0 as libc::c_int;
let mut indent: libc::c_int = 0 as libc::c_int;
let mut leading_blank: libc::c_int = 0 as libc::c_int;
let mut trailing_blank: libc::c_int = 0 as libc::c_int;
let mut trailing_blank: libc::c_int;
string.start = yaml_malloc(16 as libc::c_int as size_t) as *mut yaml_char_t;
if !(if !(string.start).is_null() {
string.pointer = string.start;
@ -7533,16 +7445,8 @@ unsafe extern "C" fn yaml_parser_scan_flow_scalar(
single: libc::c_int,
) -> libc::c_int {
let current_block: u64;
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let start_mark: yaml_mark_t;
let end_mark: yaml_mark_t;
let mut string: yaml_string_t = {
let init = yaml_string_t {
start: 0 as *mut yaml_char_t,
@ -7575,7 +7479,7 @@ unsafe extern "C" fn yaml_parser_scan_flow_scalar(
};
init
};
let mut leading_blanks: libc::c_int = 0;
let mut leading_blanks: libc::c_int;
string.start = yaml_malloc(16 as libc::c_int as size_t) as *mut yaml_char_t;
if !(if !(string.start).is_null() {
string.pointer = string.start;
@ -8479,7 +8383,7 @@ unsafe extern "C" fn yaml_parser_scan_flow_scalar(
if code_length != 0 {
let mut value: libc::c_uint =
0 as libc::c_int as libc::c_uint;
let mut k: size_t = 0;
let mut k: size_t;
if if (*parser).unread >= code_length {
1 as libc::c_int
} else {
@ -9754,16 +9658,8 @@ unsafe extern "C" fn yaml_parser_scan_plain_scalar(
mut token: *mut yaml_token_t,
) -> libc::c_int {
let current_block: u64;
let mut start_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let mut end_mark: yaml_mark_t = yaml_mark_t {
index: 0,
line: 0,
column: 0,
};
let start_mark: yaml_mark_t;
let mut end_mark: yaml_mark_t;
let mut string: yaml_string_t = {
let init = yaml_string_t {
start: 0 as *mut yaml_char_t,

12
src/writer.rs
View file

@ -12,8 +12,8 @@ unsafe extern "C" fn yaml_emitter_set_writer_error(
}
#[no_mangle]
pub unsafe extern "C" fn yaml_emitter_flush(emitter: *mut yaml_emitter_t) -> libc::c_int {
let mut low: libc::c_int = 0;
let mut high: libc::c_int = 0;
let low: libc::c_int;
let high: libc::c_int;
__assert!(!emitter.is_null());
__assert!(((*emitter).write_handler).is_some());
__assert!((*emitter).encoding as u64 != 0);
@ -59,10 +59,10 @@ pub unsafe extern "C" fn yaml_emitter_flush(emitter: *mut yaml_emitter_t) -> lib
0 as libc::c_int
};
while (*emitter).buffer.pointer != (*emitter).buffer.last {
let mut octet: libc::c_uchar = 0;
let mut width: libc::c_uint = 0;
let mut value: libc::c_uint = 0;
let mut k: size_t = 0;
let mut octet: libc::c_uchar;
let width: libc::c_uint;
let mut value: libc::c_uint;
let mut k: size_t;
octet = *((*emitter).buffer.pointer).c_offset(0 as libc::c_int as isize);
width = (if octet as libc::c_int & 0x80 as libc::c_int == 0 as libc::c_int {
1 as libc::c_int