Skip to content

Commit 28e096a

Browse files
d-e-s-odanielocfb
authored andcommitted
libbpf-cargo: Improve panic message for datasec mmap ptr retrieval
Improve the panic message we see when failing datasec mmap pointer retrieval to make it a bit more obvious what went wrong. Refs: #909 Signed-off-by: Daniel Müller <[email protected]>
1 parent 17d6cb8 commit 28e096a

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

libbpf-cargo/src/gen/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -480,11 +480,10 @@ fn gen_skel_open_map_defs(skel: &mut String, maps: &MapsData, raw_obj_name: &str
480480
{name}_data: unsafe {{
481481
config
482482
.map_mmap_ptr({mmap_idx})
483-
.ok()
484-
.unwrap_or_else(std::ptr::null_mut)
483+
.expect(\"BPF map `{name}` does not have mmap pointer\")
485484
.cast::<types::{name}>()
486485
.as_mut()
487-
.expect(\"BPF map `{name}` does not have mmap pointer\")
486+
.expect(\"BPF map `{name}` mmap pointer is NULL\")
488487
}},
489488
",
490489
name = map.name,

0 commit comments

Comments
 (0)