[PATCH 2/3] Move is_number_in_set prototype to filter.h

Edgar Kaziakhmedov edgar.kaziakhmedov at virtuozzo.com
Tue Aug 22 00:53:36 UTC 2017


Since the filter.h unites set of filtering functions and defs.h contains
superfluous and unrelated set of prototypes, is_number_in_set
should be prototyped there. Also, other binaries included in the strace
package requires it for filtering.

* defs.h(is_number_in_set): Remove it.
* filter.h: Add it.
* strace.c: Include "filter.h"
* syscall.c: Likewise.

Signed-off-by: Edgar Kaziakhmedov <edgar.kaziakhmedov at virtuozzo.com>
---
 defs.h    | 1 -
 filter.h  | 1 +
 strace.c  | 1 +
 syscall.c | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/defs.h b/defs.h
index dddad0c9..6f03c189 100644
--- a/defs.h
+++ b/defs.h
@@ -661,7 +661,6 @@ extern struct number_set read_set;
 extern struct number_set write_set;
 extern struct number_set signal_set;
 
-extern bool is_number_in_set(unsigned int number, const struct number_set *);
 extern void qualify(const char *);
 extern unsigned int qual_flags(const unsigned int);
 
diff --git a/filter.h b/filter.h
index eefbd3cb..a8f605f2 100644
--- a/filter.h
+++ b/filter.h
@@ -32,6 +32,7 @@
 struct number_set;
 typedef int (*string_to_uint_func)(const char *);
 
+extern bool is_number_in_set(unsigned int number, const struct number_set *);
 void add_number_to_set(unsigned int number, struct number_set *set);
 void qualify_tokens(const char *str, struct number_set *set,
 		    string_to_uint_func func, const char *name);
diff --git a/strace.c b/strace.c
index ae93f923..859fe930 100644
--- a/strace.c
+++ b/strace.c
@@ -46,6 +46,7 @@
 #endif
 #include <asm/unistd.h>
 
+#include "filter.h"
 #include "scno.h"
 #include "ptrace.h"
 #include "printsiginfo.h"
diff --git a/syscall.c b/syscall.c
index a0c649ea..43d1523d 100644
--- a/syscall.c
+++ b/syscall.c
@@ -43,6 +43,7 @@
 /* for __X32_SYSCALL_BIT */
 #include <asm/unistd.h>
 
+#include "filter.h"
 #include "regs.h"
 #include "ptrace.h"
 
-- 
2.11.0





More information about the Strace-devel mailing list