From b817bdb999a7d3ffa837f047a671fc2af9d7c1f1 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Tue, 11 Aug 2020 22:12:37 -0600
Subject: [PATCH] multicall: move match_options to a common include

---
 cmd/ifquery.c   | 9 ---------
 cmd/ifupdown.c  | 6 ------
 cmd/multicall.h | 9 +++++++++
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/cmd/ifquery.c b/cmd/ifquery.c
index 2778dea..f84fb28 100644
--- a/cmd/ifquery.c
+++ b/cmd/ifquery.c
@@ -186,15 +186,6 @@ ifquery_usage(int status)
 	exit(status);
 }
 
-struct match_options {
-	bool is_auto;
-	char *exclude_pattern;
-	char *include_pattern;
-	bool pretty_print;
-	bool dot;
-	char *property;
-};
-
 void
 list_interfaces(struct lif_dict *collection, struct match_options *opts)
 {
diff --git a/cmd/ifupdown.c b/cmd/ifupdown.c
index 9a9aada..1c42a3f 100644
--- a/cmd/ifupdown.c
+++ b/cmd/ifupdown.c
@@ -24,12 +24,6 @@
 #include "libifupdown/libifupdown.h"
 #include "cmd/multicall.h"
 
-struct match_options {
-	bool is_auto;
-	char *exclude_pattern;
-	char *include_pattern;
-};
-
 static bool up;
 static struct lif_execute_opts exec_opts = {
 	.executor_path = EXECUTOR_PATH,
diff --git a/cmd/multicall.h b/cmd/multicall.h
index d0f09c9..48deb26 100644
--- a/cmd/multicall.h
+++ b/cmd/multicall.h
@@ -49,4 +49,13 @@ struct if_applet {
 extern char *argv0;
 extern struct if_option_group global_option_group;
 
+struct match_options {
+	bool is_auto;
+	char *exclude_pattern;
+	char *include_pattern;
+	bool pretty_print;
+	bool dot;
+	char *property;
+};
+
 #endif