diff options
Diffstat (limited to 'ffi')
| -rw-r--r-- | ffi/Cargo.toml | 14 | ||||
| -rw-r--r-- | ffi/Makefile | 4 | ||||
| -rw-r--r-- | ffi/src/net.rs | 2 | ||||
| -rw-r--r-- | ffi/src/store.rs | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml index 7afd7f61..153eb0ff 100644 --- a/ffi/Cargo.toml +++ b/ffi/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "sequoia-ffi" description = "C API for Sequoia" -version = "0.15.0" +version = "0.17.0" authors = [ "Justus Winter <justus@sequoia-pgp.org>", "Kai Michaelis <kai@sequoia-pgp.org>", "Neal H. Walfield <neal@sequoia-pgp.org>", ] -documentation = "https://docs.sequoia-pgp.org/0.15.0/sequoia_ffi" +documentation = "https://docs.sequoia-pgp.org/0.17.0/sequoia_ffi" homepage = "https://sequoia-pgp.org/" repository = "https://gitlab.com/sequoia-pgp/sequoia" readme = "../README.md" @@ -22,11 +22,11 @@ gitlab = { repository = "sequoia-pgp/sequoia" } maintenance = { status = "actively-developed" } [dependencies] -sequoia-ffi-macros = { path = "../ffi-macros", version = "0.15" } -sequoia-openpgp = { path = "../openpgp", version = "0.15" } -sequoia-core = { path = "../core", version = "0.15" } -sequoia-store = { path = "../store", version = "0.15" } -sequoia-net = { path = "../net", version = "0.15" } +sequoia-ffi-macros = { path = "../ffi-macros", version = "0.17" } +sequoia-openpgp = { path = "../openpgp", version = "0.17" } +sequoia-core = { path = "../core", version = "0.17" } +sequoia-store = { path = "../store", version = "0.17" } +sequoia-net = { path = "../net", version = "0.17" } anyhow = "1" lazy_static = "1.0.0" libc = "0.2.33" diff --git a/ffi/Makefile b/ffi/Makefile index dde7af48..f35c2238 100644 --- a/ffi/Makefile +++ b/ffi/Makefile @@ -31,10 +31,10 @@ export PREFIX export DESTDIR # $(1) = install dir -# $(2) = whether to set libdir to $(1) (empty string = false) +# $(2) = whether to set libdir and prefix to $(1) (empty string = false) sequoia_pc = \ sed -e 's|VERSION|$(VERSION)|g' \ - -e 's|PREFIX|$(shell pwd)|g' \ + $(if $(2),-e 's|PREFIX|$(shell pwd)|g',-e's|PREFIX|$(PREFIX)|g') \ $(if $(2),-e 's|libdir=.*|libdir=$(1)|g') \ sequoia.pc.in \ >$(1)/sequoia.pc diff --git a/ffi/src/net.rs b/ffi/src/net.rs index f40de413..52fc7982 100644 --- a/ffi/src/net.rs +++ b/ffi/src/net.rs @@ -13,7 +13,7 @@ //! //! [SKS keyserver]: https://www.sks-keyservers.net/overview-of-pools.php#pool_hkps //! -//! ```c, no-run +//! ```c //! #include <sequoia.h> //! //! sq_context_t ctx; diff --git a/ffi/src/store.rs b/ffi/src/store.rs index af71d350..5e6dce3d 100644 --- a/ffi/src/store.rs +++ b/ffi/src/store.rs @@ -165,8 +165,8 @@ fn sq_log_iter_next(iter: *mut LogIter) -> *mut Log { binding: maybe_box_raw!(e.binding), key: maybe_box_raw!(e.key), slug: ffi_return_string!(&e.slug), - status: status, - error: error, + status, + error, }) }, None => ptr::null_mut(), |