libbpf: Wrap libbpf API direct err with libbpf_err
PATCH 1/1 libbpf: Wrap libbpf API direct err with libbpf_err
Just wrap the direct err with libbpf_err, keep consistency with other APIs.
Signed-off-by Tao Chen <[email protected]>
--- tools/lib/bpf/libbpf.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
tools/lib/bpf/libbpf.c +11 -11
@@ -9145,12 +9145,12 @@ int bpf_object__gen_loader(struct bpf_object *obj, struct gen_loader_opts *opts)struct bpf_gen *gen;if (!opts) -return -EFAULT ; +return libbpf_err (-EFAULT );if (!OPTS_VALID (opts, gen_loader_opts)) -return -EINVAL ; +return libbpf_err (-EINVAL ); gen =calloc (sizeof (*gen),1 );if (!gen) -return -ENOMEM ; +return libbpf_err (-ENOMEM ); gen->opts = opts; gen->swapped_endian = !is_native_endianness (obj); obj->gen_loader = gen;
@@ -9262,13 +9262,13 @@ int bpf_program__set_insns(struct bpf_program *prog,struct bpf_insn *insns;if (prog->obj->loaded) -return -EBUSY ; +return libbpf_err (-EBUSY ); insns =libbpf_reallocarray (prog->insns, new_insn_cnt,sizeof (*insns));/* NULL is a valid return from reallocarray if the new count is zero */ if (!insns && new_insn_cnt) {pr_warn ("prog '%s': failed to realloc prog code\n" , prog->name); -return -ENOMEM ; +return libbpf_err (-ENOMEM ); }memcpy (insns, new_insns, new_insn_cnt *sizeof (*insns));
@@ -9379,11 +9379,11 @@ const char *bpf_program__log_buf(const struct bpf_program *prog, size_t *log_sizint bpf_program__set_log_buf (struct bpf_program *prog,char *log_buf,size_t log_size) {if (log_size && !log_buf) -return -EINVAL ; +return libbpf_err (-EINVAL );if (prog->log_size >UINT_MAX ) -return -EINVAL ; +return libbpf_err (-EINVAL );if (prog->obj->loaded) -return -EBUSY ; +return libbpf_err (-EBUSY ); prog->log_buf = log_buf; prog->log_size = log_size;
@@ -13070,17 +13070,17 @@ int bpf_link__update_map(struct bpf_link *link, const struct bpf_map *map)int err;if (!bpf_map__is_struct_ops (map)) -return -EINVAL ; +return libbpf_err (-EINVAL );if (map->fd <0 ) {pr_warn ("map '%s': can't use BPF map without FD (was it created?)\n" , map->name); -return -EINVAL ; +return libbpf_err (-EINVAL ); } st_ops_link = container_of(link, struct bpf_link_struct_ops, link);/* Ensure the type of a link is correct */ if (st_ops_link->map_fd <0 ) -return -EINVAL ; +return libbpf_err (-EINVAL ); err =bpf_map_update_elem (map->fd, &zero, map->st_ops->kern_vdata,0 );/* It can be EBUSY if the map has been used to create or
Signature · 1 line
2.43.0