*: remove references to embedded fields

Satisfy staticcheck:

QF1008: could remove embedded field "mutableTypes" from selector

Signed-off-by: Timo Beckers <[email protected]>

Author: ti-mo

btf/btf.go

@@ -537,7 +537,7 @@ func (s *Spec) Copy() *Spec {
 	}
 
 	return &Spec{
-		s.mutableTypes.copy(),
+		s.copy(),
 		s.strings,
 	}
 }
@@ -579,7 +579,7 @@ func (s *Spec) TypeByID(id TypeID) (Type, error) {
 //
 // Returns an error wrapping [ErrNotFound] if the type isn't part of the Spec.
 func (s *Spec) TypeID(typ Type) (TypeID, error) {
-	return s.mutableTypes.typeID(typ)
+	return s.typeID(typ)
 }
 
 // AnyTypesByName returns a list of BTF Types with the given name.
@@ -590,7 +590,7 @@ func (s *Spec) TypeID(typ Type) (TypeID, error) {
 //
 // Returns an error wrapping ErrNotFound if no matching Type exists in the Spec.
 func (s *Spec) AnyTypesByName(name string) ([]Type, error) {
-	return s.mutableTypes.anyTypesByName(name)
+	return s.anyTypesByName(name)
 }
 
 // AnyTypeByName returns a Type with the given name.

elf_reader.go

@@ -80,8 +80,8 @@ func LoadCollectionSpecFromReader(rd io.ReaderAt) (*CollectionSpec, error) {
 
 	// Checks if the ELF file is for BPF data.
 	// Old LLVM versions set e_machine to EM_NONE.
-	if f.File.Machine != elf.EM_NONE && f.File.Machine != elf.EM_BPF {
-		return nil, fmt.Errorf("unexpected machine type for BPF ELF: %s", f.File.Machine)
+	if f.Machine != elf.EM_NONE && f.Machine != elf.EM_BPF {
+		return nil, fmt.Errorf("unexpected machine type for BPF ELF: %s", f.Machine)
 	}
 
 	var (
@@ -1095,7 +1095,7 @@ func resolveBTFValuesContents(es *elfSection, vs *btf.VarSecinfo, member btf.Mem
 	end := vs.Size + vs.Offset
 	// The size of an address in this section. This determines the width of
 	// an index in the array.
-	align := uint32(es.SectionHeader.Addralign)
+	align := uint32(es.Addralign)
 
 	// Check if variable-length section is aligned.
 	if (end-start)%align != 0 {

examples/fentry/main.go

@@ -48,14 +48,14 @@ func main() {
 	defer objs.Close()
 
 	link, err := link.AttachTracing(link.TracingOptions{
-		Program: objs.bpfPrograms.TcpConnect,
+		Program: objs.TcpConnect,
 	})
 	if err != nil {
 		log.Fatal(err)
 	}
 	defer link.Close()
 
-	rd, err := ringbuf.NewReader(objs.bpfMaps.Events)
+	rd, err := ringbuf.NewReader(objs.Events)
 	if err != nil {
 		log.Fatalf("opening ringbuf reader: %s", err)
 	}

examples/tcprtt/main.go

@@ -49,14 +49,14 @@ func main() {
 	defer objs.Close()
 
 	link, err := link.AttachTracing(link.TracingOptions{
-		Program: objs.bpfPrograms.TcpClose,
+		Program: objs.TcpClose,
 	})
 	if err != nil {
 		log.Fatal(err)
 	}
 	defer link.Close()
 
-	rd, err := ringbuf.NewReader(objs.bpfMaps.Events)
+	rd, err := ringbuf.NewReader(objs.Events)
 	if err != nil {
 		log.Fatalf("opening ringbuf reader: %s", err)
 	}

examples/tcprtt_sockops/main.go

@@ -66,7 +66,7 @@ func main() {
 	// Attach ebpf program to a cgroupv2
 	link, err := link.AttachCgroup(link.CgroupOptions{
 		Path:    cgroupPath,
-		Program: objs.bpfPrograms.BpfSockopsCb,
+		Program: objs.BpfSockopsCb,
 		Attach:  ebpf.AttachCGroupSockOps,
 	})
 	if err != nil {
@@ -76,7 +76,7 @@ func main() {
 
 	log.Printf("eBPF program loaded and attached on cgroup %s\n", cgroupPath)
 
-	rd, err := ringbuf.NewReader(objs.bpfMaps.RttEvents)
+	rd, err := ringbuf.NewReader(objs.RttEvents)
 	if err != nil {
 		log.Fatalf("opening ringbuf reader: %s", err)
 	}