Skip to content

Commit d9409ea

Browse files
alexgartrelldanielocfb
authored andcommitted
libbpf-rs: Replace size_of with size_of_val in query.rs
This is closing out a TODO from a previous commit
1 parent 2575135 commit d9409ea

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

libbpf-rs/src/query.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
1313
use core::ffi::c_void;
1414
use std::convert::TryFrom;
15-
// TODO: convert remaining instances of size_of to size_of_val for clarity
16-
use std::mem::size_of;
1715
use std::mem::size_of_val;
1816
use std::os::raw::c_char;
1917
use std::string::String;
@@ -77,7 +75,7 @@ macro_rules! gen_info_impl {
7775
// and will return E2BIG otherwise.
7876
let mut item: $uapi_info_ty = unsafe { std::mem::zeroed() };
7977
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;
8179

8280
let ret = unsafe { libbpf_sys::bpf_obj_get_info_by_fd(fd, item_ptr as *mut c_void, &mut len) };
8381
let parsed_uapi = if ret != 0 {
@@ -514,7 +512,7 @@ impl BtfInfo {
514512
let mut name: Vec<u8> = Vec::new();
515513

516514
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;
518516

519517
let ret =
520518
unsafe { libbpf_sys::bpf_obj_get_info_by_fd(fd, item_ptr as *mut c_void, &mut len) };
@@ -636,7 +634,7 @@ impl LinkInfo {
636634
s.__bindgen_anon_1.raw_tracepoint.tp_name = buf.as_mut_ptr() as u64;
637635
s.__bindgen_anon_1.raw_tracepoint.tp_name_len = buf.len() as u32;
638636
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;
640638

641639
let ret = unsafe {
642640
libbpf_sys::bpf_obj_get_info_by_fd(fd, item_ptr as *mut c_void, &mut len)

0 commit comments

Comments
 (0)