Commit a6c109a6 authored Feb 05, 2019 by Yonghong Song Committed by Alexei Starovoitov Feb 05, 2019

tools/bpf: add const qualifier to btf__get_map_kv_tids() map_name parameter



Commit 96408c43 ("tools/bpf: implement libbpf btf__get_map_kv_tids() API function")
added the API function btf__get_map_kv_tids():
  btf__get_map_kv_tids(const struct btf *btf, char *map_name, ...)

The parameter map_name has type "char *". This is okay inside libbpf library since
the map_name is from bpf_map->name which also has type "char *".

This will be problematic if the caller for map_name already has attribute "const",
e.g., from C++ string.c_str(). It will result in either a warning or an error.

  /home/yhs/work/bcc/src/cc/btf.cc:166:51:
    error: invalid conversion from ‘const char*’ to ‘char*’ [-fpermissive]
      return btf__get_map_kv_tids(btf_, map_name.c_str()

This patch added "const" attributes to map_name parameter.

Fixes: 96408c43 ("tools/bpf: implement libbpf btf__get_map_kv_tids() API function")
Signed-off-by: Yonghong Song <yhs@fb.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

parent 206dafb0

tools/lib/bpf/btf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -511,7 +511,7 @@ exit_free:
		return err;
		}

		int btf__get_map_kv_tids(const struct btf btf, char map_name,
		int btf__get_map_kv_tids(const struct btf btf, const char map_name,
		__u32 expected_key_size, __u32 expected_value_size,
		__u32 key_type_id, __u32 value_type_id)
		{

tools/lib/bpf/btf.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ LIBBPF_API void btf__get_strings(const struct btf btf, const char *strings,
		__u32 *str_len);
		LIBBPF_API const char btf__name_by_offset(const struct btf btf, __u32 offset);
		LIBBPF_API int btf__get_from_id(__u32 id, struct btf **btf);
		LIBBPF_API int btf__get_map_kv_tids(const struct btf btf, char map_name,
		LIBBPF_API int btf__get_map_kv_tids(const struct btf btf, const char map_name,
		__u32 expected_key_size,
		__u32 expected_value_size,
		__u32 key_type_id, __u32 value_type_id);

Admin message