Remove dangerous result/option macros

This commit is contained in:
Jackson Coxson
2025-09-03 19:48:43 -06:00
parent ca56575c6c
commit b0e3c5769a
8 changed files with 215 additions and 201 deletions

View File

@@ -9,21 +9,9 @@
int main() {
idevice_init_logger(Debug, Disabled, NULL);
auto u_res = IdeviceFFI::UsbmuxdConnection::default_new(0);
if_let_err(u_res, e, {
std::cerr << "failed to connect to usbmuxd";
std::cerr << e.message;
return 1;
});
auto& u = u_res.unwrap();
auto u = IdeviceFFI::UsbmuxdConnection::default_new(0).expect("failed to connect to usbmuxd");
auto devices_res = u.get_devices();
if_let_err(devices_res, e, {
std::cerr << "failed to get devices from usbmuxd";
std::cerr << e.message;
return 1;
});
auto devices = std::move(devices_res).unwrap();
auto devices = u.get_devices().expect("failed to get devices from usbmuxd");
if (devices.empty()) {
std::cerr << "no devices connected";
@@ -44,28 +32,15 @@ int main() {
return 1;
}
IdeviceFFI::UsbmuxdAddr addr = IdeviceFFI::UsbmuxdAddr::default_new();
auto prov_res = IdeviceFFI::Provider::usbmuxd_new(
std::move(addr), /*tag*/ 0, udid.unwrap(), id.unwrap(), "reeeeeeeee");
if_let_err(prov_res, e, {
std::cerr << "provider failed: " << e.message << "\n";
return 1;
});
auto& prov = prov_res.unwrap();
IdeviceFFI::UsbmuxdAddr addr = IdeviceFFI::UsbmuxdAddr::default_new();
auto prov = IdeviceFFI::Provider::usbmuxd_new(
std::move(addr), /*tag*/ 0, udid.unwrap(), id.unwrap(), "reeeeeeeee")
.expect("Failed to create usbmuxd provider");
auto client_res = IdeviceFFI::Lockdown::connect(prov);
if_let_err(client_res, e, {
std::cerr << "lockdown connect failed: " << e.message << "\n";
return 1;
});
auto& client = client_res.unwrap();
auto client = IdeviceFFI::Lockdown::connect(prov).expect("lockdown connect failed");
auto pf = prov.get_pairing_file();
if_let_err(pf, e, {
std::cerr << "failed to get pairing file: " << e.message << "\n";
return 1;
});
client.start_session(pf.unwrap());
auto pf = prov.get_pairing_file().expect("failed to get pairing file");
client.start_session(pf).expect("failed to start session");
auto values = client.get_value(NULL, NULL);
match_result(