Skip to content
This repository has been archived by the owner on Jun 8, 2021. It is now read-only.

Commit

Permalink
regen
Browse files Browse the repository at this point in the history
  • Loading branch information
@GuillaumeGomez
GuillaumeGomez committed Jul 11, 2019
1 parent e55b78a commit 7f0c548
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 67 deletions.
7 changes: 3 additions & 4 deletions src/auto/application_command_line.rs
View file
Expand Up @@ -14,7 +14,6 @@ use glib_sys;
use std;
use std::boxed::Box as Box_;
use std::fmt;
use std::mem;
use std::mem::transmute;
use File;
use InputStream;
Expand Down Expand Up @@ -71,13 +70,13 @@ impl<O: IsA<ApplicationCommandLine>> ApplicationCommandLineExt for O {

fn get_arguments(&self) -> Vec<std::ffi::OsString> {
unsafe {
let mut argc = mem::MaybeUninit::uninit();
let mut argc = 0;
let ret = FromGlibContainer::from_glib_full_num(
gio_sys::g_application_command_line_get_arguments(
self.as_ref().to_glib_none().0,
argc.as_mut_ptr(),
&mut argc,
),
argc.assume_init() as usize,
argc as usize,
);
ret
}
Expand Down
7 changes: 3 additions & 4 deletions src/auto/buffered_input_stream.rs
View file
Expand Up @@ -17,7 +17,6 @@ use glib_sys;
use gobject_sys;
use std::boxed::Box as Box_;
use std::fmt;
use std::mem;
use std::mem::transmute;
use std::ptr;
use Cancellable;
Expand Down Expand Up @@ -234,13 +233,13 @@ impl<O: IsA<BufferedInputStream>> BufferedInputStreamExt for O {

fn peek_buffer(&self) -> Vec<u8> {
unsafe {
let mut count = mem::MaybeUninit::uninit();
let mut count = 0;
let ret = FromGlibContainer::from_glib_none_num(
gio_sys::g_buffered_input_stream_peek_buffer(
self.as_ref().to_glib_none().0,
count.as_mut_ptr(),
&mut count,
),
count.assume_init() as usize,
count as usize,
);
ret
}
Expand Down
26 changes: 10 additions & 16 deletions src/auto/data_input_stream.rs
View file
Expand Up @@ -18,7 +18,6 @@ use glib_sys;
use gobject_sys;
use std::boxed::Box as Box_;
use std::fmt;
use std::mem;
use std::mem::transmute;
use std::ptr;
use BufferedInputStream;
Expand Down Expand Up @@ -295,15 +294,14 @@ impl<O: IsA<DataInputStream>> DataInputStreamExt for O {
cancellable: Option<&P>,
) -> Result<(Option<GString>, usize), Error> {
unsafe {
let mut length = mem::MaybeUninit::uninit();
let mut length = 0;
let mut error = ptr::null_mut();
let ret = gio_sys::g_data_input_stream_read_line_utf8(
self.as_ref().to_glib_none().0,
length.as_mut_ptr(),
&mut length,
cancellable.map(|p| p.as_ref()).to_glib_none().0,
&mut error,
);
let length = length.assume_init();
if error.is_null() {
Ok((from_glib_full(ret), length))
} else {
Expand Down Expand Up @@ -366,16 +364,15 @@ impl<O: IsA<DataInputStream>> DataInputStreamExt for O {
cancellable: Option<&P>,
) -> Result<(GString, usize), Error> {
unsafe {
let mut length = mem::MaybeUninit::uninit();
let mut length = 0;
let mut error = ptr::null_mut();
let ret = gio_sys::g_data_input_stream_read_until(
self.as_ref().to_glib_none().0,
stop_chars.to_glib_none().0,
length.as_mut_ptr(),
&mut length,
cancellable.map(|p| p.as_ref()).to_glib_none().0,
&mut error,
);
let length = length.assume_init();
if error.is_null() {
Ok((from_glib_full(ret), length))
} else {
Expand Down Expand Up @@ -403,14 +400,13 @@ impl<O: IsA<DataInputStream>> DataInputStreamExt for O {
user_data: glib_sys::gpointer,
) {
let mut error = ptr::null_mut();
let mut length = mem::MaybeUninit::uninit();
let mut length = 0;
let ret = gio_sys::g_data_input_stream_read_until_finish(
_source_object as *mut _,
res,
length.as_mut_ptr(),
&mut length,
&mut error,
);
let length = length.assume_init();
let result = if error.is_null() {
Ok((from_glib_full(ret), length))
} else {
Expand Down Expand Up @@ -461,17 +457,16 @@ impl<O: IsA<DataInputStream>> DataInputStreamExt for O {
) -> Result<(GString, usize), Error> {
let stop_chars_len = stop_chars.len() as isize;
unsafe {
let mut length = mem::MaybeUninit::uninit();
let mut length = 0;
let mut error = ptr::null_mut();
let ret = gio_sys::g_data_input_stream_read_upto(
self.as_ref().to_glib_none().0,
stop_chars.to_glib_none().0,
stop_chars_len,
length.as_mut_ptr(),
&mut length,
cancellable.map(|p| p.as_ref()).to_glib_none().0,
&mut error,
);
let length = length.assume_init();
if error.is_null() {
Ok((from_glib_full(ret), length))
} else {
Expand Down Expand Up @@ -500,14 +495,13 @@ impl<O: IsA<DataInputStream>> DataInputStreamExt for O {
user_data: glib_sys::gpointer,
) {
let mut error = ptr::null_mut();
let mut length = mem::MaybeUninit::uninit();
let mut length = 0;
let ret = gio_sys::g_data_input_stream_read_upto_finish(
_source_object as *mut _,
res,
length.as_mut_ptr(),
&mut length,
&mut error,
);
let length = length.assume_init();
let result = if error.is_null() {
Ok((from_glib_full(ret), length))
} else {
Expand Down
8 changes: 3 additions & 5 deletions src/auto/desktop_app_info.rs
View file
Expand Up @@ -9,8 +9,6 @@ use glib::translate::*;
use glib::GString;
use std;
use std::fmt;
#[cfg(any(feature = "v2_60", feature = "dox"))]
use std::mem;
use AppInfo;
use AppLaunchContext;

Expand Down Expand Up @@ -205,14 +203,14 @@ impl<O: IsA<DesktopAppInfo>> DesktopAppInfoExt for O {
#[cfg(any(feature = "v2_60", feature = "dox"))]
fn get_string_list(&self, key: &str) -> Vec<GString> {
unsafe {
let mut length = mem::MaybeUninit::uninit();
let mut length = 0;
let ret = FromGlibContainer::from_glib_full_num(
gio_sys::g_desktop_app_info_get_string_list(
self.as_ref().to_glib_none().0,
key.to_glib_none().0,
length.as_mut_ptr(),
&mut length,
),
length.assume_init() as usize,
length as usize,
);
ret
}
Expand Down
28 changes: 12 additions & 16 deletions src/auto/file.rs
View file
Expand Up @@ -14,7 +14,6 @@ use gobject_sys;
use std;
use std::boxed::Box as Box_;
use std::fmt;
use std::mem;
use std::ptr;
use AppInfo;
use Cancellable;
Expand Down Expand Up @@ -1512,20 +1511,20 @@ impl<O: IsA<File>> FileExt for O {
) -> Result<(Vec<u8>, GString), Error> {
unsafe {
let mut contents = ptr::null_mut();
let mut length = mem::MaybeUninit::uninit();
let mut length = 0;
let mut etag_out = ptr::null_mut();
let mut error = ptr::null_mut();
let _ = gio_sys::g_file_load_contents(
self.as_ref().to_glib_none().0,
cancellable.map(|p| p.as_ref()).to_glib_none().0,
&mut contents,
length.as_mut_ptr(),
&mut length,
&mut etag_out,
&mut error,
);
if error.is_null() {
Ok((
FromGlibContainer::from_glib_full_num(contents, length.assume_init() as usize),
FromGlibContainer::from_glib_full_num(contents, length as usize),
from_glib_full(etag_out),
))
} else {
Expand All @@ -1552,19 +1551,19 @@ impl<O: IsA<File>> FileExt for O {
) {
let mut error = ptr::null_mut();
let mut contents = ptr::null_mut();
let mut length = mem::MaybeUninit::uninit();
let mut length = 0;
let mut etag_out = ptr::null_mut();
let _ = gio_sys::g_file_load_contents_finish(
_source_object as *mut _,
res,
&mut contents,
length.as_mut_ptr(),
&mut length,
&mut etag_out,
&mut error,
);
let result = if error.is_null() {
Ok((
FromGlibContainer::from_glib_full_num(contents, length.assume_init() as usize),
FromGlibContainer::from_glib_full_num(contents, length as usize),
from_glib_full(etag_out),
))
} else {
Expand Down Expand Up @@ -1771,24 +1770,21 @@ impl<O: IsA<File>> FileExt for O {
let super_callback0: Box_<Option<Box<dyn Fn(bool, u64, u64, u64) + 'static>>> =
progress_callback_data;
unsafe {
let mut disk_usage = mem::MaybeUninit::uninit();
let mut num_dirs = mem::MaybeUninit::uninit();
let mut num_files = mem::MaybeUninit::uninit();
let mut disk_usage = 0;
let mut num_dirs = 0;
let mut num_files = 0;
let mut error = ptr::null_mut();
let _ = gio_sys::g_file_measure_disk_usage(
self.as_ref().to_glib_none().0,
flags.to_glib(),
cancellable.map(|p| p.as_ref()).to_glib_none().0,
progress_callback,
Box::into_raw(super_callback0) as *mut _,
disk_usage.as_mut_ptr(),
num_dirs.as_mut_ptr(),
num_files.as_mut_ptr(),
&mut disk_usage,
&mut num_dirs,
&mut num_files,
&mut error,
);
let disk_usage = disk_usage.assume_init();
let num_dirs = num_dirs.assume_init();
let num_files = num_files.assume_init();
if error.is_null() {
Ok((disk_usage, num_dirs, num_files))
} else {
Expand Down
16 changes: 6 additions & 10 deletions src/auto/functions.rs
View file
Expand Up @@ -14,7 +14,6 @@ use gobject_sys;
use std;
#[cfg(feature = "futures")]
use std::boxed::Box as Box_;
use std::mem;
use std::ptr;
use Cancellable;
use Error;
Expand Down Expand Up @@ -168,14 +167,13 @@ pub fn content_type_get_symbolic_icon(type_: &str) -> Option<Icon> {
pub fn content_type_guess(filename: Option<&str>, data: &[u8]) -> (GString, bool) {
let data_size = data.len() as usize;
unsafe {
let mut result_uncertain = mem::MaybeUninit::uninit();
let mut result_uncertain = 0;
let ret = from_glib_full(gio_sys::g_content_type_guess(
filename.to_glib_none().0,
data.to_glib_none().0,
data_size,
result_uncertain.as_mut_ptr(),
&mut result_uncertain,
));
let result_uncertain = result_uncertain.assume_init();
(ret, from_glib(result_uncertain))
}
}
Expand Down Expand Up @@ -460,18 +458,16 @@ pub fn resources_get_info(
lookup_flags: ResourceLookupFlags,
) -> Result<(usize, u32), Error> {
unsafe {
let mut size = mem::MaybeUninit::uninit();
let mut flags = mem::MaybeUninit::uninit();
let mut size = 0;
let mut flags = 0;
let mut error = ptr::null_mut();
let _ = gio_sys::g_resources_get_info(
path.to_glib_none().0,
lookup_flags.to_glib(),
size.as_mut_ptr(),
flags.as_mut_ptr(),
&mut size,
&mut flags,
&mut error,
);
let size = size.assume_init();
let flags = flags.assume_init();
if error.is_null() {
Ok((size, flags))
} else {
Expand Down
11 changes: 4 additions & 7 deletions src/auto/resource.rs
View file
Expand Up @@ -7,7 +7,6 @@ use glib;
use glib::translate::*;
use glib::GString;
use std;
use std::mem;
use std::ptr;
use Error;
use InputStream;
Expand Down Expand Up @@ -52,19 +51,17 @@ impl Resource {
lookup_flags: ResourceLookupFlags,
) -> Result<(usize, u32), Error> {
unsafe {
let mut size = mem::MaybeUninit::uninit();
let mut flags = mem::MaybeUninit::uninit();
let mut size = 0;
let mut flags = 0;
let mut error = ptr::null_mut();
let _ = gio_sys::g_resource_get_info(
self.to_glib_none().0,
path.to_glib_none().0,
lookup_flags.to_glib(),
size.as_mut_ptr(),
flags.as_mut_ptr(),
&mut size,
&mut flags,
&mut error,
);
let size = size.assume_init();
let flags = flags.assume_init();
if error.is_null() {
Ok((size, flags))
} else {
Expand Down
6 changes: 2 additions & 4 deletions src/auto/socket.rs
View file
Expand Up @@ -16,7 +16,6 @@ use glib_sys;
use gobject_sys;
use std::boxed::Box as Box_;
use std::fmt;
use std::mem;
use std::mem::transmute;
use std::ptr;
use Cancellable;
Expand Down Expand Up @@ -456,16 +455,15 @@ impl<O: IsA<Socket>> SocketExt for O {

fn get_option(&self, level: i32, optname: i32) -> Result<i32, Error> {
unsafe {
let mut value = mem::MaybeUninit::uninit();
let mut value = 0;
let mut error = ptr::null_mut();
let _ = gio_sys::g_socket_get_option(
self.as_ref().to_glib_none().0,
level,
optname,
value.as_mut_ptr(),
&mut value,
&mut error,
);
let value = value.assume_init();
if error.is_null() {
Ok(value)
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/auto/versions.txt
View file
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ fb0b31c)
Generated by gir (https://github.com/gtk-rs/gir @ fb0b31c+)
from gir-files (https://github.com/gtk-rs/gir-files @ 8befbe7)

0 comments on commit 7f0c548

Please sign in to comment.