diff options
| author |   Jakub Kicinski <jakub.kicinski@netronome.com> | 2018-07-10 14:42:57 -0700 |
|---|---|---|
| committer |   Daniel Borkmann <daniel@iogearbox.net> | 2018-07-11 22:13:33 +0200 |
| commit | 8d1fc3de3d9f9bda0d8ec719d8686e9c5b432573 (patch) | |
| tree | f874af9902794ffeaab8d779edcf808024a3ad9b /tools/bpf/bpftool/prog.c | |
| parent | selftests/bpf: add Error: prefix in check_extack helper (diff) | |
| download | linux-dev-8d1fc3de3d9f9bda0d8ec719d8686e9c5b432573.tar.xz linux-dev-8d1fc3de3d9f9bda0d8ec719d8686e9c5b432573.zip | |
tools: bpftool: refactor argument parsing for prog load
Add a new macro for printing more informative message than straight
usage() when parameters are missing, and use it for prog do_load().
Save the object and pin path argument to variables for clarity.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to '')
| -rw-r--r-- | tools/bpf/bpftool/prog.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index a740da99d477..a5ef46c59029 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -681,18 +681,21 @@ static int do_pin(int argc, char **argv) static int do_load(int argc, char **argv) { + const char *objfile, *pinfile; struct bpf_object *obj; int prog_fd; - if (argc != 2) - usage(); + if (!REQ_ARGS(2)) + return -1; + objfile = GET_ARG(); + pinfile = GET_ARG(); - if (bpf_prog_load(argv[0], BPF_PROG_TYPE_UNSPEC, &obj, &prog_fd)) { + if (bpf_prog_load(objfile, BPF_PROG_TYPE_UNSPEC, &obj, &prog_fd)) { p_err("failed to load program"); return -1; } - if (do_pin_fd(prog_fd, argv[1])) + if (do_pin_fd(prog_fd, pinfile)) goto err_close_obj; if (json_output) |