min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow attributes on error items

This commit is contained in:
Steven Fackler 2019-03-12 20:32:21 -07:00
parent acb629a47f
commit 92d623bd64
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openssl-errors/src/lib.rs
View File

@ -1,7 +1,7 @@
use libc::{c_char, c_int}; use libc::{c_char, c_int};
use std::ptr;
use std::borrow::Cow; use std::borrow::Cow;
use std::marker::PhantomData; use std::marker::PhantomData;
use std::ptr;
#[doc(hidden)] #[doc(hidden)]
pub mod export { pub mod export {
@ -84,7 +84,7 @@ pub unsafe fn __put_error<T>(
Some((ptr, openssl_sys::ERR_TXT_MALLOCED)) Some((ptr, openssl_sys::ERR_TXT_MALLOCED))
} }
} }
None => None None => None,
}; };
if let Some((ptr, flags)) = data { if let Some((ptr, flags)) = data {
openssl_sys::ERR_set_error_data(ptr, flags | openssl_sys::ERR_TXT_STRING); openssl_sys::ERR_set_error_data(ptr, flags | openssl_sys::ERR_TXT_STRING);
@ -135,20 +135,24 @@ macro_rules! put_error {
#[macro_export] #[macro_export]
macro_rules! openssl_errors { macro_rules! openssl_errors {
($( ($(
$(#[$lib_attr:meta])*
$lib_vis:vis library $lib_name:ident($lib_str:expr) { $lib_vis:vis library $lib_name:ident($lib_str:expr) {
functions { functions {
$( $(
$(#[$func_attr:meta])*
$func_name:ident($func_str:expr); $func_name:ident($func_str:expr);
)* )*
} }
reasons { reasons {
$( $(
$(#[$reason_attr:meta])*
$reason_name:ident($reason_str:expr); $reason_name:ident($reason_str:expr);
)* )*
} }
} }
)*) => {$( )*) => {$(
$(#[$lib_attr])*
$lib_vis enum $lib_name {} $lib_vis enum $lib_name {}
impl $crate::Library for $lib_name { impl $crate::Library for $lib_name {
@ -192,16 +196,18 @@ macro_rules! openssl_errors {
} }
impl $lib_name { impl $lib_name {
$crate::openssl_errors!(@func_consts $lib_name; 1; $($func_name;)*); $crate::openssl_errors!(@func_consts $lib_name; 1; $($(#[$func_attr])* $func_name;)*);
$crate::openssl_errors!(@reason_consts $lib_name; 1; $($reason_name;)*); $crate::openssl_errors!(@reason_consts $lib_name; 1; $($(#[$reason_attr])* $reason_name;)*);
} }
)*}; )*};
(@func_consts $lib_name:ident; $n:expr; $name:ident; $($tt:tt)*) => { (@func_consts $lib_name:ident; $n:expr; $(#[$attr:meta])* $name:ident; $($tt:tt)*) => {
$(#[$attr])*
pub const $name: $crate::Function<$lib_name> = $crate::Function::from_raw($n); pub const $name: $crate::Function<$lib_name> = $crate::Function::from_raw($n);
$crate::openssl_errors!(@func_consts $lib_name; $n + 1; $($tt)*); $crate::openssl_errors!(@func_consts $lib_name; $n + 1; $($tt)*);
}; };
(@func_consts $lib_name:ident; $n:expr;) => {}; (@func_consts $lib_name:ident; $n:expr;) => {};
(@reason_consts $lib_name:ident; $n:expr; $name:ident; $($tt:tt)*) => { (@reason_consts $lib_name:ident; $n:expr; $(#[$attr:meta])* $name:ident; $($tt:tt)*) => {
$(#[$attr])*
pub const $name: $crate::Reason<$lib_name> = $crate::Reason::from_raw($n); pub const $name: $crate::Reason<$lib_name> = $crate::Reason::from_raw($n);
$crate::openssl_errors!(@reason_consts $lib_name; $n + 1; $($tt)*); $crate::openssl_errors!(@reason_consts $lib_name; $n + 1; $($tt)*);
}; };