Skip to content

Commit

Permalink
Merge pull request #18 from qiujiangkun/bugix_c_char
Browse files Browse the repository at this point in the history
Use *const c_char instead of *const i8 to improve portability
  • Loading branch information
jedisct1 committed May 31, 2021
2 parents 52812fa + 1d643ac commit 939c6b0
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/c_abi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ unsafe extern "C" fn delete(
unsafe fn add_to_section(
parsed_packet: *mut ParsedPacket,
section: Section,
rr_str: *const i8,
rr_str: *const c_char,
) -> Result<(), Error> {
let rr_str = match CStr::from_ptr(rr_str).to_str() {
Err(_) => bail!(DSError::ParseError),
Expand All @@ -374,7 +374,7 @@ unsafe fn add_to_section(
unsafe extern "C" fn add_to_question(
parsed_packet: *mut ParsedPacket,
c_err: *mut *const CErr,
rr_str: *const i8,
rr_str: *const c_char,
) -> c_int {
match add_to_section(parsed_packet, Section::Question, rr_str) {
Err(e) => throw_err(e, c_err),
Expand All @@ -385,7 +385,7 @@ unsafe extern "C" fn add_to_question(
unsafe extern "C" fn add_to_answer(
parsed_packet: *mut ParsedPacket,
c_err: *mut *const CErr,
rr_str: *const i8,
rr_str: *const c_char,
) -> c_int {
match add_to_section(parsed_packet, Section::Answer, rr_str) {
Err(e) => throw_err(e, c_err),
Expand All @@ -396,7 +396,7 @@ unsafe extern "C" fn add_to_answer(
unsafe extern "C" fn add_to_nameservers(
parsed_packet: *mut ParsedPacket,
c_err: *mut *const CErr,
rr_str: *const i8,
rr_str: *const c_char,
) -> c_int {
match add_to_section(parsed_packet, Section::NameServers, rr_str) {
Err(e) => throw_err(e, c_err),
Expand All @@ -407,7 +407,7 @@ unsafe extern "C" fn add_to_nameservers(
unsafe extern "C" fn add_to_additional(
parsed_packet: *mut ParsedPacket,
c_err: *mut *const CErr,
rr_str: *const i8,
rr_str: *const c_char,
) -> c_int {
match add_to_section(parsed_packet, Section::Additional, rr_str) {
Err(e) => throw_err(e, c_err),
Expand Down Expand Up @@ -552,22 +552,22 @@ pub struct FnTable {
pub add_to_question: unsafe extern "C" fn(
parsed_packet: *mut ParsedPacket,
c_err: *mut *const CErr,
rr_str: *const i8,
rr_str: *const c_char,
) -> c_int,
pub add_to_answer: unsafe extern "C" fn(
parsed_packet: *mut ParsedPacket,
c_err: *mut *const CErr,
rr_str: *const i8,
rr_str: *const c_char,
) -> c_int,
pub add_to_nameservers: unsafe extern "C" fn(
parsed_packet: *mut ParsedPacket,
c_err: *mut *const CErr,
rr_str: *const i8,
rr_str: *const c_char,
) -> c_int,
pub add_to_additional: unsafe extern "C" fn(
parsed_packet: *mut ParsedPacket,
c_err: *mut *const CErr,
rr_str: *const i8,
rr_str: *const c_char,
) -> c_int,
pub raw_packet: unsafe extern "C" fn(
parsed_packet: *const ParsedPacket,
Expand Down

0 comments on commit 939c6b0

Please sign in to comment.