fix: libbpf samples

linsyking · linsyking · commit 9729957c6de2 · 2025-04-13T22:13:58.000-04:00
diff --git a/samples/bpf/cpustat_user.c b/samples/bpf/cpustat_user.c
@@ -208,7 +208,7 @@ int main(int argc, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/fds_example.c b/samples/bpf/fds_example.c
@@ -60,7 +60,7 @@ static int bpf_prog_create(const char *object)
 	if (object) {
 		obj = bpf_object__open_file(object, NULL);
 		assert(!libbpf_get_error(obj));
-		err = bpf_object__load(obj, 0, NULL, NULL);
+		err = bpf_object__load(obj);
 		assert(!err);
 		return bpf_program__fd(bpf_object__next_program(obj, NULL));
 	} else {
diff --git a/samples/bpf/hbm.c b/samples/bpf/hbm.c
@@ -128,7 +128,7 @@ static int prog_load(char *prog)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		printf("ERROR: loading BPF object file failed\n");
 		goto err;
 	}
diff --git a/samples/bpf/ibumad_user.c b/samples/bpf/ibumad_user.c
@@ -120,7 +120,7 @@ int main(int argc, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/lathist_user.c b/samples/bpf/lathist_user.c
@@ -94,7 +94,7 @@ int main(int argc, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/map_perf_test_user.c b/samples/bpf/map_perf_test_user.c
@@ -467,7 +467,7 @@ int main(int argc, char **argv)
 		fixup_map(obj);
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/offwaketime_user.c b/samples/bpf/offwaketime_user.c
@@ -114,7 +114,7 @@ int main(int argc, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/sampleip_user.c b/samples/bpf/sampleip_user.c
@@ -199,7 +199,7 @@ int main(int argc, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/sockex1_user.c b/samples/bpf/sockex1_user.c
@@ -26,7 +26,7 @@ int main(int ac, char **argv)
 	prog = bpf_object__next_program(obj, NULL);
 	bpf_program__set_type(prog, BPF_PROG_TYPE_SOCKET_FILTER);
 
-	err = bpf_object__load(obj, 0, NULL, NULL);
+	err = bpf_object__load(obj);
 	if (err)
 		return 1;
 
diff --git a/samples/bpf/sockex2_user.c b/samples/bpf/sockex2_user.c
@@ -30,7 +30,7 @@ int main(int ac, char **argv)
 	prog = bpf_object__next_program(obj, NULL);
 	bpf_program__set_type(prog, BPF_PROG_TYPE_SOCKET_FILTER);
 
-	err = bpf_object__load(obj, 0, NULL, NULL);
+	err = bpf_object__load(obj);
 	if (err)
 		return 1;
 
diff --git a/samples/bpf/sockex3_user.c b/samples/bpf/sockex3_user.c
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/spintest_user.c b/samples/bpf/spintest_user.c
@@ -31,7 +31,7 @@ int main(int ac, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/task_fd_query_user.c b/samples/bpf/task_fd_query_user.c
@@ -329,7 +329,7 @@ int main(int argc, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/test_cgrp2_sock2.c b/samples/bpf/test_cgrp2_sock2.c
@@ -68,7 +68,7 @@ int main(int argc, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		printf("ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/test_current_task_under_cgroup_user.c b/samples/bpf/test_current_task_under_cgroup_user.c
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/test_map_in_map_user.c b/samples/bpf/test_map_in_map_user.c
@@ -134,7 +134,7 @@ int main(int argc, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/test_overhead_user.c b/samples/bpf/test_overhead_user.c
@@ -141,7 +141,7 @@ static int load_progs(char *filename)
 	}
 
 	/* load BPF program */
-	err = bpf_object__load(obj, 0, NULL, NULL);
+	err = bpf_object__load(obj);
 	if (err < 0) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		return err;
diff --git a/samples/bpf/test_probe_write_user_user.c b/samples/bpf/test_probe_write_user_user.c
@@ -38,7 +38,7 @@ int main(int ac, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/trace_event_user.c b/samples/bpf/trace_event_user.c
@@ -322,7 +322,7 @@ int main(int argc, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		printf("loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/trace_output_user.c b/samples/bpf/trace_output_user.c
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/tracex1_user.c b/samples/bpf/tracex1_user.c
@@ -26,7 +26,7 @@ int main(int ac, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/tracex2_user.c b/samples/bpf/tracex2_user.c
@@ -131,7 +131,7 @@ int main(int ac, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/tracex3_user.c b/samples/bpf/tracex3_user.c
@@ -133,7 +133,7 @@ int main(int ac, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/tracex4_user.c b/samples/bpf/tracex4_user.c
@@ -61,7 +61,7 @@ int main(int ac, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/tracex5_user.c b/samples/bpf/tracex5_user.c
@@ -56,7 +56,7 @@ int main(int ac, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/tracex6_user.c b/samples/bpf/tracex6_user.c
@@ -188,7 +188,7 @@ int main(int argc, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/tracex7_user.c b/samples/bpf/tracex7_user.c
@@ -33,7 +33,7 @@ int main(int argc, char **argv)
 	}
 
 	/* load BPF program */
-	if (bpf_object__load(obj, 0, NULL, NULL)) {
+	if (bpf_object__load(obj)) {
 		fprintf(stderr, "ERROR: loading BPF object file failed\n");
 		goto cleanup;
 	}
diff --git a/samples/bpf/xdp_adjust_tail_user.c b/samples/bpf/xdp_adjust_tail_user.c
@@ -153,7 +153,7 @@ int main(int argc, char **argv)
 	prog = bpf_object__next_program(obj, NULL);
 	bpf_program__set_type(prog, BPF_PROG_TYPE_XDP);
 
-	err = bpf_object__load(obj, 0, NULL, NULL);
+	err = bpf_object__load(obj);
 	if (err)
 		return 1;
 
diff --git a/samples/bpf/xdp_fwd_user.c b/samples/bpf/xdp_fwd_user.c
@@ -173,7 +173,7 @@ int main(int argc, char **argv)
 		prog = bpf_object__next_program(obj, NULL);
 		bpf_program__set_type(prog, BPF_PROG_TYPE_XDP);
 
-		err = bpf_object__load(obj, 0, NULL, NULL);
+		err = bpf_object__load(obj);
 		if (err) {
 			printf("Does kernel support devmap lookup?\n");
 			/* If not, the error message will be:
diff --git a/samples/bpf/xdp_tx_iptunnel_user.c b/samples/bpf/xdp_tx_iptunnel_user.c
@@ -264,7 +264,7 @@ int main(int argc, char **argv)
 	prog = bpf_object__next_program(obj, NULL);
 	bpf_program__set_type(prog, BPF_PROG_TYPE_XDP);
 
-	err = bpf_object__load(obj, 0, NULL, NULL);
+	err = bpf_object__load(obj);
 	if (err) {
 		printf("bpf_object__load(): %s\n", strerror(errno));
 		return 1;

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ int main(int argc, char **argv)`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`/* load BPF program */`
`211`		`- if (bpf_object__load(obj, 0, NULL, NULL)) {`
	`211`	`+ if (bpf_object__load(obj)) {`
`212`	`212`	`fprintf(stderr, "ERROR: loading BPF object file failed\n");`
`213`	`213`	`goto cleanup;`
`214`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ static int prog_load(char *prog)`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`/* load BPF program */`
`131`		`- if (bpf_object__load(obj, 0, NULL, NULL)) {`
	`131`	`+ if (bpf_object__load(obj)) {`
`132`	`132`	`printf("ERROR: loading BPF object file failed\n");`
`133`	`133`	`goto err;`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ int main(int argc, char **argv)`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`/* load BPF program */`
`123`		`- if (bpf_object__load(obj, 0, NULL, NULL)) {`
	`123`	`+ if (bpf_object__load(obj)) {`
`124`	`124`	`fprintf(stderr, "ERROR: loading BPF object file failed\n");`
`125`	`125`	`goto cleanup;`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ int main(int argc, char **argv)`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`/* load BPF program */`
`97`		`- if (bpf_object__load(obj, 0, NULL, NULL)) {`
	`97`	`+ if (bpf_object__load(obj)) {`
`98`	`98`	`fprintf(stderr, "ERROR: loading BPF object file failed\n");`
`99`	`99`	`goto cleanup;`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ int main(int argc, char **argv)`
`467`	`467`	`fixup_map(obj);`
`468`	`468`
`469`	`469`	`/* load BPF program */`
`470`		`- if (bpf_object__load(obj, 0, NULL, NULL)) {`
	`470`	`+ if (bpf_object__load(obj)) {`
`471`	`471`	`fprintf(stderr, "ERROR: loading BPF object file failed\n");`
`472`	`472`	`goto cleanup;`
`473`	`473`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ int main(int argc, char **argv)`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`/* load BPF program */`
`117`		`- if (bpf_object__load(obj, 0, NULL, NULL)) {`
	`117`	`+ if (bpf_object__load(obj)) {`
`118`	`118`	`fprintf(stderr, "ERROR: loading BPF object file failed\n");`
`119`	`119`	`goto cleanup;`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ int main(int argc, char **argv)`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`/* load BPF program */`
`202`		`- if (bpf_object__load(obj, 0, NULL, NULL)) {`
	`202`	`+ if (bpf_object__load(obj)) {`
`203`	`203`	`fprintf(stderr, "ERROR: loading BPF object file failed\n");`
`204`	`204`	`goto cleanup;`
`205`	`205`	`}`