Skip to content

Commit e94d5a1

Browse files
committed
Drop as u32 casts from rustls_result
1 parent 5f66c7d commit e94d5a1

1 file changed

Lines changed: 45 additions & 47 deletions

File tree

rules/rustls/tgt_unsafe.rs

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -48,29 +48,29 @@ unsafe fn f7(
4848
a1: *mut u8,
4949
a2: u64,
5050
a3: *mut u64,
51-
) -> u32 {
51+
) -> ::rustls_ffi::rustls_result {
5252
::rustls_ffi::connection::rustls_connection::rustls_connection_read(
5353
a0,
5454
a1,
5555
a2 as usize,
5656
a3 as *mut usize,
57-
) as u32
57+
)
5858
}
5959
unsafe fn f8(
6060
a0: *mut ::rustls_ffi::connection::rustls_connection,
6161
a1: *const u8,
6262
a2: u64,
6363
a3: *mut u64,
64-
) -> u32 {
64+
) -> ::rustls_ffi::rustls_result {
6565
::rustls_ffi::connection::rustls_connection::rustls_connection_write(
6666
a0,
6767
a1,
6868
a2 as usize,
6969
a3 as *mut usize,
70-
) as u32
70+
)
7171
}
72-
unsafe fn f9(a0: *mut ::rustls_ffi::connection::rustls_connection) -> u32 {
73-
::rustls_ffi::connection::rustls_connection::rustls_connection_process_new_packets(a0) as u32
72+
unsafe fn f9(a0: *mut ::rustls_ffi::connection::rustls_connection) -> ::rustls_ffi::rustls_result {
73+
::rustls_ffi::connection::rustls_connection::rustls_connection_process_new_packets(a0)
7474
}
7575
unsafe fn f10(a0: *const ::rustls_ffi::connection::rustls_connection) -> bool {
7676
::rustls_ffi::connection::rustls_connection::rustls_connection_wants_read(a0)
@@ -196,9 +196,8 @@ fn t29() -> ::rustls_ffi::client::rustls_verify_server_cert_params<'static> {
196196
unsafe fn f21(
197197
a0: *mut ::rustls_ffi::client::rustls_client_config_builder,
198198
a1: *mut *const ::rustls_ffi::client::rustls_client_config,
199-
) -> u32 {
199+
) -> ::rustls_ffi::rustls_result {
200200
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_build(a0, a1)
201-
as u32
202201
}
203202
unsafe fn f22(a0: *mut ::rustls_ffi::client::rustls_client_config_builder) {
204203
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_free(a0)
@@ -208,27 +207,27 @@ unsafe fn f23(
208207
a1: *const u16,
209208
a2: u64,
210209
a3: *mut *mut ::rustls_ffi::client::rustls_client_config_builder,
211-
) -> u32 {
210+
) -> ::rustls_ffi::rustls_result {
212211
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_new_custom(
213212
a0,
214213
a1,
215214
a2 as usize,
216215
a3,
217-
) as u32
216+
)
218217
}
219218
unsafe fn f24(
220219
a0: *mut ::rustls_ffi::client::rustls_client_config_builder,
221220
a1: *const ::rustls_ffi::rslice::rustls_slice_bytes<'static>,
222221
a2: u64,
223-
) -> u32 {
224-
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_set_alpn_protocols(a0, a1, a2 as usize) as u32
222+
) -> ::rustls_ffi::rustls_result {
223+
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_set_alpn_protocols(a0, a1, a2 as usize)
225224
}
226225
unsafe fn f25(
227226
a0: *mut ::rustls_ffi::client::rustls_client_config_builder,
228227
a1: *const *const ::rustls_ffi::certificate::rustls_certified_key,
229228
a2: u64,
230-
) -> u32 {
231-
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_set_certified_key(a0, a1, a2 as usize) as u32
229+
) -> ::rustls_ffi::rustls_result {
230+
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_set_certified_key(a0, a1, a2 as usize)
232231
}
233232
unsafe fn f26(
234233
a0: *mut ::rustls_ffi::client::rustls_client_config_builder,
@@ -243,57 +242,57 @@ unsafe fn f28(
243242
a0: *const ::rustls_ffi::client::rustls_client_config,
244243
a1: *const u8,
245244
a2: *mut *mut ::rustls_ffi::connection::rustls_connection,
246-
) -> u32 {
245+
) -> ::rustls_ffi::rustls_result {
247246
::rustls_ffi::client::rustls_client_config::rustls_client_connection_new(
248247
a0,
249248
a1 as *const ::std::ffi::c_char,
250249
a2,
251-
) as u32
250+
)
252251
}
253252

254253
unsafe fn f29(
255254
a0: *const ::rustls_ffi::certificate::rustls_certificate<'static>,
256255
a1: *mut *const u8,
257256
a2: *mut u64,
258-
) -> u32 {
259-
::rustls_ffi::certificate::rustls_certificate_get_der(a0, a1, a2 as *mut usize) as u32
257+
) -> ::rustls_ffi::rustls_result {
258+
::rustls_ffi::certificate::rustls_certificate_get_der(a0, a1, a2 as *mut usize)
260259
}
261260
unsafe fn f30(
262261
a0: *const u8,
263262
a1: u64,
264263
a2: *const u8,
265264
a3: u64,
266265
a4: *mut *const ::rustls_ffi::certificate::rustls_certified_key,
267-
) -> u32 {
266+
) -> ::rustls_ffi::rustls_result {
268267
::rustls_ffi::certificate::rustls_certified_key::rustls_certified_key_build(
269268
a0,
270269
a1 as usize,
271270
a2,
272271
a3 as usize,
273272
a4,
274-
) as u32
273+
)
275274
}
276275
unsafe fn f31(a0: *const ::rustls_ffi::certificate::rustls_certified_key) {
277276
::rustls_ffi::certificate::rustls_certified_key::rustls_certified_key_free(a0)
278277
}
279-
unsafe fn f32(a0: *const ::rustls_ffi::certificate::rustls_certified_key) -> u32 {
280-
::rustls_ffi::certificate::rustls_certified_key::rustls_certified_key_keys_match(a0) as u32
278+
unsafe fn f32(a0: *const ::rustls_ffi::certificate::rustls_certified_key) -> ::rustls_ffi::rustls_result {
279+
::rustls_ffi::certificate::rustls_certified_key::rustls_certified_key_keys_match(a0)
281280
}
282281
unsafe fn f33(
283282
a0: *mut ::rustls_ffi::certificate::rustls_root_cert_store_builder,
284283
a1: *const u8,
285284
a2: u64,
286285
a3: bool,
287-
) -> u32 {
288-
::rustls_ffi::certificate::rustls_root_cert_store_builder::rustls_root_cert_store_builder_add_pem(a0, a1, a2 as usize, a3) as u32
286+
) -> ::rustls_ffi::rustls_result {
287+
::rustls_ffi::certificate::rustls_root_cert_store_builder::rustls_root_cert_store_builder_add_pem(a0, a1, a2 as usize, a3)
289288
}
290289
unsafe fn f34(
291290
a0: *mut ::rustls_ffi::certificate::rustls_root_cert_store_builder,
292291
a1: *mut *const ::rustls_ffi::certificate::rustls_root_cert_store,
293-
) -> u32 {
292+
) -> ::rustls_ffi::rustls_result {
294293
::rustls_ffi::certificate::rustls_root_cert_store_builder::rustls_root_cert_store_builder_build(
295294
a0, a1,
296-
) as u32
295+
)
297296
}
298297
unsafe fn f35(a0: *mut ::rustls_ffi::certificate::rustls_root_cert_store_builder) {
299298
::rustls_ffi::certificate::rustls_root_cert_store_builder::rustls_root_cert_store_builder_free(
@@ -304,8 +303,8 @@ unsafe fn f36(
304303
a0: *mut ::rustls_ffi::certificate::rustls_root_cert_store_builder,
305304
a1: *const u8,
306305
a2: bool,
307-
) -> u32 {
308-
::rustls_ffi::certificate::rustls_root_cert_store_builder::rustls_root_cert_store_builder_load_roots_from_file(a0, a1 as *const ::std::ffi::c_char, a2) as u32
306+
) -> ::rustls_ffi::rustls_result {
307+
::rustls_ffi::certificate::rustls_root_cert_store_builder::rustls_root_cert_store_builder_load_roots_from_file(a0, a1 as *const ::std::ffi::c_char, a2)
309308
}
310309
unsafe fn f37() -> *mut ::rustls_ffi::certificate::rustls_root_cert_store_builder {
311310
::rustls_ffi::certificate::rustls_root_cert_store_builder::rustls_root_cert_store_builder_new()
@@ -317,25 +316,25 @@ unsafe fn f38(a0: *const ::rustls_ffi::certificate::rustls_root_cert_store) {
317316
unsafe fn f39(
318317
a0: *mut ::rustls_ffi::crypto_provider::rustls_crypto_provider_builder,
319318
a1: *mut *const ::rustls_ffi::crypto_provider::rustls_crypto_provider,
320-
) -> u32 {
321-
::rustls_ffi::crypto_provider::rustls_crypto_provider_builder_build(a0, a1) as u32
319+
) -> ::rustls_ffi::rustls_result {
320+
::rustls_ffi::crypto_provider::rustls_crypto_provider_builder_build(a0, a1)
322321
}
323322
unsafe fn f40(a0: *mut ::rustls_ffi::crypto_provider::rustls_crypto_provider_builder) {
324323
::rustls_ffi::crypto_provider::rustls_crypto_provider_builder_free(a0)
325324
}
326-
unsafe fn f41(a0: *mut *mut ::rustls_ffi::crypto_provider::rustls_crypto_provider_builder) -> u32 {
327-
::rustls_ffi::crypto_provider::rustls_crypto_provider_builder_new_from_default(a0) as u32
325+
unsafe fn f41(a0: *mut *mut ::rustls_ffi::crypto_provider::rustls_crypto_provider_builder) -> ::rustls_ffi::rustls_result {
326+
::rustls_ffi::crypto_provider::rustls_crypto_provider_builder_new_from_default(a0)
328327
}
329328
unsafe fn f42(
330329
a0: *mut ::rustls_ffi::crypto_provider::rustls_crypto_provider_builder,
331330
a1: *const *const ::rustls_ffi::cipher::rustls_supported_ciphersuite,
332331
a2: u64,
333-
) -> u32 {
332+
) -> ::rustls_ffi::rustls_result {
334333
::rustls_ffi::crypto_provider::rustls_crypto_provider_builder_set_cipher_suites(
335334
a0,
336335
a1,
337336
a2 as usize,
338-
) as u32
337+
)
339338
}
340339
unsafe fn f43(a0: *const ::rustls_ffi::crypto_provider::rustls_crypto_provider) {
341340
::rustls_ffi::crypto_provider::rustls_crypto_provider_free(a0)
@@ -346,13 +345,12 @@ unsafe fn f44(a0: u64) -> *const ::rustls_ffi::cipher::rustls_supported_ciphersu
346345
unsafe fn f45() -> u64 {
347346
::rustls_ffi::crypto_provider::rustls_default_crypto_provider_ciphersuites_len() as u64
348347
}
349-
unsafe fn f46(a0: *mut u8, a1: u64) -> u32 {
350-
::rustls_ffi::crypto_provider::rustls_default_crypto_provider_random(a0, a1 as usize) as u32
348+
unsafe fn f46(a0: *mut u8, a1: u64) -> ::rustls_ffi::rustls_result {
349+
::rustls_ffi::crypto_provider::rustls_default_crypto_provider_random(a0, a1 as usize)
351350
}
352351

353-
unsafe fn f47(a0: *mut *mut ::rustls_ffi::verifier::rustls_server_cert_verifier) -> u32 {
352+
unsafe fn f47(a0: *mut *mut ::rustls_ffi::verifier::rustls_server_cert_verifier) -> ::rustls_ffi::rustls_result {
354353
::rustls_ffi::verifier::rustls_server_cert_verifier::rustls_platform_server_cert_verifier(a0)
355-
as u32
356354
}
357355
unsafe fn f48(a0: *mut ::rustls_ffi::verifier::rustls_server_cert_verifier) {
358356
::rustls_ffi::verifier::rustls_server_cert_verifier::rustls_server_cert_verifier_free(a0)
@@ -361,27 +359,27 @@ unsafe fn f49(
361359
a0: *mut ::rustls_ffi::verifier::rustls_web_pki_server_cert_verifier_builder,
362360
a1: *const u8,
363361
a2: u64,
364-
) -> u32 {
362+
) -> ::rustls_ffi::rustls_result {
365363
unsafe extern "C" {
366364
fn rustls_web_pki_server_cert_verifier_builder_add_crl(
367365
builder: *mut ::rustls_ffi::verifier::rustls_web_pki_server_cert_verifier_builder,
368366
crl_pem: *const u8,
369367
crl_pem_len: usize,
370368
) -> ::rustls_ffi::rustls_result;
371369
}
372-
rustls_web_pki_server_cert_verifier_builder_add_crl(a0, a1, a2 as usize) as u32
370+
rustls_web_pki_server_cert_verifier_builder_add_crl(a0, a1, a2 as usize)
373371
}
374372
unsafe fn f50(
375373
a0: *mut ::rustls_ffi::verifier::rustls_web_pki_server_cert_verifier_builder,
376374
a1: *mut *mut ::rustls_ffi::verifier::rustls_server_cert_verifier,
377-
) -> u32 {
375+
) -> ::rustls_ffi::rustls_result {
378376
unsafe extern "C" {
379377
fn rustls_web_pki_server_cert_verifier_builder_build(
380378
builder: *mut ::rustls_ffi::verifier::rustls_web_pki_server_cert_verifier_builder,
381379
verifier_out: *mut *mut ::rustls_ffi::verifier::rustls_server_cert_verifier,
382380
) -> ::rustls_ffi::rustls_result;
383381
}
384-
rustls_web_pki_server_cert_verifier_builder_build(a0, a1) as u32
382+
rustls_web_pki_server_cert_verifier_builder_build(a0, a1)
385383
}
386384
unsafe fn f51(a0: *mut ::rustls_ffi::verifier::rustls_web_pki_server_cert_verifier_builder) {
387385
unsafe extern "C" {
@@ -459,7 +457,7 @@ unsafe fn f60(
459457
a0: *mut ::rustls_ffi::client::rustls_client_config_builder,
460458
a1: unsafe fn(::rustls_ffi::rslice::rustls_str<'static>, *const u8, u64, *const u8, u64),
461459
a2: Option<unsafe fn(::rustls_ffi::rslice::rustls_str<'static>) -> i32>,
462-
) -> u32 {
460+
) -> ::rustls_ffi::rustls_result {
463461
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_set_key_log(
464462
a0,
465463
std::mem::transmute::<*const (), ::rustls_ffi::keylog::rustls_keylog_log_callback>(
@@ -469,19 +467,19 @@ unsafe fn f60(
469467
Option<unsafe fn(::rustls_ffi::rslice::rustls_str<'static>) -> i32>,
470468
::rustls_ffi::keylog::rustls_keylog_will_log_callback,
471469
>(a2),
472-
) as u32
470+
)
473471
}
474472
unsafe fn f61(
475473
a0: *mut ::rustls_ffi::client::rustls_client_config_builder,
476474
a1: unsafe fn(
477475
*mut ::libc::c_void,
478476
*const ::rustls_ffi::client::rustls_verify_server_cert_params<'static>,
479-
) -> u32,
480-
) -> u32 {
477+
) -> ::rustls_ffi::rustls_result,
478+
) -> ::rustls_ffi::rustls_result {
481479
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_dangerous_set_certificate_verifier(
482480
a0,
483481
std::mem::transmute::<*const (), ::rustls_ffi::client::rustls_verify_server_cert_callback>(
484482
a1 as *const (),
485483
),
486-
) as u32
484+
)
487485
}

0 commit comments

Comments
 (0)