Merge pull request #2838 from cgwalters/more-binding-fixes

More binding fixes

rust-bindings/sys/src/auto/versions.txt

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 0eeebbdf9d4d)
-from gir-files (@ 1b758c141dda)
+from gir-files (@ 00c41eacd26a)

rust-bindings/sys/src/lib.rs

@@ -309,62 +309,6 @@ impl ::std::fmt::Debug for OstreeAsyncProgressClass {
     }
 }
 
-#[repr(C)]
-pub struct _OstreeBootloader {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeBootloader = *mut _OstreeBootloader;
-
-#[repr(C)]
-pub struct _OstreeBootloaderAboot {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeBootloaderAboot = *mut _OstreeBootloaderAboot;
-
-#[repr(C)]
-pub struct _OstreeBootloaderGrub2 {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeBootloaderGrub2 = *mut _OstreeBootloaderGrub2;
-
-#[repr(C)]
-pub struct _OstreeBootloaderSyslinux {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeBootloaderSyslinux = *mut _OstreeBootloaderSyslinux;
-
-#[repr(C)]
-pub struct _OstreeBootloaderUboot {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeBootloaderUboot = *mut _OstreeBootloaderUboot;
-
-#[repr(C)]
-pub struct _OstreeBootloaderZipl {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeBootloaderZipl = *mut _OstreeBootloaderZipl;
-
-#[repr(C)]
-pub struct _OstreeChecksumInputStreamPrivate {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeChecksumInputStreamPrivate = *mut _OstreeChecksumInputStreamPrivate;
-
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct OstreeCollectionRef {
@@ -465,14 +409,6 @@ impl ::std::fmt::Debug for OstreeDiffItem {
     }
 }
 
-#[repr(C)]
-pub struct _OstreeGpgVerifier {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeGpgVerifier = *mut _OstreeGpgVerifier;
-
 #[repr(C)]
 pub struct _OstreeKernelArgs {
     _data: [u8; 0],
@@ -489,30 +425,6 @@ pub struct _OstreeKernelArgsEntry {
 
 pub type OstreeKernelArgsEntry = *mut _OstreeKernelArgsEntry;
 
-#[repr(C)]
-pub struct _OstreeLibarchiveInputStreamPrivate {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeLibarchiveInputStreamPrivate = *mut _OstreeLibarchiveInputStreamPrivate;
-
-#[repr(C)]
-pub struct _OstreeLzmaCompressor {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeLzmaCompressor = *mut _OstreeLzmaCompressor;
-
-#[repr(C)]
-pub struct _OstreeLzmaDecompressor {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeLzmaDecompressor = *mut _OstreeLzmaDecompressor;
-
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct OstreeMutableTreeClass {
@@ -699,14 +611,6 @@ impl ::std::fmt::Debug for OstreeRepoFileClass {
     }
 }
 
-#[repr(C)]
-pub struct _OstreeRepoFileEnumerator {
-    _data: [u8; 0],
-    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
-}
-
-pub type OstreeRepoFileEnumerator = *mut _OstreeRepoFileEnumerator;
-
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct OstreeRepoFinderAvahiClass {
@@ -1665,12 +1569,6 @@ extern "C" {
         error: *mut *mut glib::GError,
     ) -> gboolean;
 
-    //=========================================================================
-    // OstreeChecksumInputStream
-    //=========================================================================
-    pub fn ostree_checksum_input_stream_get_type() -> GType;
-    //pub fn ostree_checksum_input_stream_new(stream: *mut gio::GInputStream, checksum: *mut glib::GChecksum) -> /*Ignored*/*mut OstreeChecksumInputStream;
-
     //=========================================================================
     // OstreeContentWriter
     //=========================================================================
@@ -3545,38 +3443,6 @@ extern "C" {
         out_success_message: *mut *mut c_char,
         error: *mut *mut glib::GError,
     ) -> gboolean;
-    pub fn ostree_sign_dummy_add_pk(
-        self_: *mut OstreeSign,
-        key: *mut glib::GVariant,
-        error: *mut *mut glib::GError,
-    ) -> gboolean;
-    pub fn ostree_sign_dummy_data(
-        self_: *mut OstreeSign,
-        data: *mut glib::GBytes,
-        signature: *mut *mut glib::GBytes,
-        cancellable: *mut gio::GCancellable,
-        error: *mut *mut glib::GError,
-    ) -> gboolean;
-    pub fn ostree_sign_dummy_data_verify(
-        self_: *mut OstreeSign,
-        data: *mut glib::GBytes,
-        signatures: *mut glib::GVariant,
-        success_message: *mut *mut c_char,
-        error: *mut *mut glib::GError,
-    ) -> gboolean;
-    pub fn ostree_sign_dummy_get_name(self_: *mut OstreeSign) -> *const c_char;
-    pub fn ostree_sign_dummy_metadata_format(self_: *mut OstreeSign) -> *const c_char;
-    pub fn ostree_sign_dummy_metadata_key(self_: *mut OstreeSign) -> *const c_char;
-    pub fn ostree_sign_dummy_set_pk(
-        self_: *mut OstreeSign,
-        key: *mut glib::GVariant,
-        error: *mut *mut glib::GError,
-    ) -> gboolean;
-    pub fn ostree_sign_dummy_set_sk(
-        self_: *mut OstreeSign,
-        key: *mut glib::GVariant,
-        error: *mut *mut glib::GError,
-    ) -> gboolean;
     pub fn ostree_sign_ed25519_add_pk(
         self_: *mut OstreeSign,
         public_key: *mut glib::GVariant,

src/libostree/ostree-repo.c

@@ -982,7 +982,7 @@ _ostree_repo_remote_name_is_file (const char *remote_name)
  * underneath that group, or @default_value if the remote exists but not the
  * option name.  If an error is returned, @out_value will be set to %NULL.
  *
- * Returns: (nullable): %TRUE on success, otherwise %FALSE with @error set
+ * Returns: %TRUE on success, otherwise %FALSE with @error set
  *
  * Since: 2016.5
  */