minijail: fix undefined inline function error under clang.
In C99 standard. Inline functions only make sense when you
put them in a ".h" file. The whole concept is about making
the function definition visible to all callers. In this case,
the function 'set_bpf_instr' is declared in bpf.h and defined
in bpf.c and it is called by functions from libsyscalls.gen.c
When compiling libsyscalls.gen.c, it finds the 'set_bpf_instr'
is a inline funtions, however, in this compilation unit,
it could not find the definition, so the error pops out.
BUG=chromium:298450
TEST=FEATURES="test" CC=i686-pc-linux-gnu-clang
emerge-x86-generic chromeos-minijail
Change-Id: I666386337379c5897bdd3772fed428f284e76661
Reviewed-on: https://chromium-review.googlesource.com/170615
Reviewed-by: Luis Lozano <llozano@chromium.org>
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
Commit-Queue: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
diff --git a/bpf.c b/bpf.c
index 97f0d5b..8eacab8 100644
--- a/bpf.c
+++ b/bpf.c
@@ -10,18 +10,6 @@
#include "bpf.h"
-/* Basic BPF instruction setter. */
-inline size_t set_bpf_instr(struct sock_filter *instr,
- unsigned short code, unsigned int k,
- unsigned char jt, unsigned char jf)
-{
- instr->code = code;
- instr->k = k;
- instr->jt = jt;
- instr->jf = jf;
- return 1U;
-}
-
/* Architecture validation. */
size_t bpf_validate_arch(struct sock_filter *filter)
{
diff --git a/bpf.h b/bpf.h
index d5010d9..cfa6d3e 100644
--- a/bpf.h
+++ b/bpf.h
@@ -137,9 +137,16 @@
};
/* BPF instruction manipulation functions and macros. */
-inline size_t set_bpf_instr(struct sock_filter *instr,
- unsigned short code, unsigned int k,
- unsigned char jt, unsigned char jf);
+static inline size_t set_bpf_instr(struct sock_filter *instr,
+ unsigned short code, unsigned int k,
+ unsigned char jt, unsigned char jf)
+{
+ instr->code = code;
+ instr->k = k;
+ instr->jt = jt;
+ instr->jf = jf;
+ return 1U;
+}
#define set_bpf_stmt(_block, _code, _k) \
set_bpf_instr((_block), (_code), (_k), 0, 0)
