|
12 | 12 |
|
13 | 13 | use core::ffi::c_void;
|
14 | 14 | use std::convert::TryFrom;
|
15 |
| -// TODO: convert remaining instances of size_of to size_of_val for clarity |
16 |
| -use std::mem::size_of; |
17 | 15 | use std::mem::size_of_val;
|
18 | 16 | use std::os::raw::c_char;
|
19 | 17 | use std::string::String;
|
@@ -77,7 +75,7 @@ macro_rules! gen_info_impl {
|
77 | 75 | // and will return E2BIG otherwise.
|
78 | 76 | let mut item: $uapi_info_ty = unsafe { std::mem::zeroed() };
|
79 | 77 | let item_ptr: *mut $uapi_info_ty = &mut item;
|
80 |
| - let mut len = size_of::<$uapi_info_ty>() as u32; |
| 78 | + let mut len = size_of_val(&item) as u32; |
81 | 79 |
|
82 | 80 | let ret = unsafe { libbpf_sys::bpf_obj_get_info_by_fd(fd, item_ptr as *mut c_void, &mut len) };
|
83 | 81 | let parsed_uapi = if ret != 0 {
|
@@ -514,7 +512,7 @@ impl BtfInfo {
|
514 | 512 | let mut name: Vec<u8> = Vec::new();
|
515 | 513 |
|
516 | 514 | let item_ptr: *mut libbpf_sys::bpf_btf_info = &mut item;
|
517 |
| - let mut len = size_of::<libbpf_sys::bpf_btf_info>() as u32; |
| 515 | + let mut len = size_of_val(&item) as u32; |
518 | 516 |
|
519 | 517 | let ret =
|
520 | 518 | unsafe { libbpf_sys::bpf_obj_get_info_by_fd(fd, item_ptr as *mut c_void, &mut len) };
|
@@ -636,7 +634,7 @@ impl LinkInfo {
|
636 | 634 | s.__bindgen_anon_1.raw_tracepoint.tp_name = buf.as_mut_ptr() as u64;
|
637 | 635 | s.__bindgen_anon_1.raw_tracepoint.tp_name_len = buf.len() as u32;
|
638 | 636 | let item_ptr: *mut libbpf_sys::bpf_link_info = &mut s;
|
639 |
| - let mut len = size_of::<libbpf_sys::bpf_link_info>() as u32; |
| 637 | + let mut len = size_of_val(&s) as u32; |
640 | 638 |
|
641 | 639 | let ret = unsafe {
|
642 | 640 | libbpf_sys::bpf_obj_get_info_by_fd(fd, item_ptr as *mut c_void, &mut len)
|
|
0 commit comments