tidy code

neomutt · Sep 1, 2023 · 496d2f6 · 496d2f6
1 parent daa1939
commit 496d2f6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/alias/dlg_query.c b/alias/dlg_query.c
@@ -80,11 +80,11 @@
 #include "email/lib.h"
 #include "core/lib.h"
 #include "gui/lib.h"
-#include "pattern/lib.h"
 #include "mutt.h"
 #include "lib.h"
 #include "enter/lib.h"
 #include "menu/lib.h"
+#include "pattern/lib.h"
 #include "send/lib.h"
 #include "alias.h"
 #include "format_flags.h"

diff --git a/pattern/pattern.c b/pattern/pattern.c
@@ -49,6 +49,7 @@
 #include "mx.h"
 #include "opcodes.h"
 #include "protos.h"
+#include "search_state.h"
 #ifndef USE_FMEMOPEN
 #include <sys/stat.h>
 #endif

diff --git a/pattern/search_state.c b/pattern/search_state.c
@@ -26,7 +26,9 @@
  * Holds state of a search
  */
 
+#include "config.h"
 #include "mutt/lib.h"
+#include "search_state.h"
 #include "lib.h"
 
 /**

diff --git a/pattern/search_state.h b/pattern/search_state.h
@@ -20,6 +20,9 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef MUTT_PATTERN_SEARCH_STATE_H
+#define MUTT_PATTERN_SEARCH_STATE_H
+
 #include <stdbool.h>
 #include <stdint.h>
 
@@ -28,7 +31,8 @@
  *
  * This data is kept to allow operations like OP_SEARCH_NEXT.
  */
-struct SearchState {
+struct SearchState
+{
   struct PatternList *pattern;     ///< compiled search pattern
   struct Buffer      *string;      ///< search string
   struct Buffer      *string_expn; ///< expanded search string
@@ -42,3 +46,5 @@ typedef uint8_t SearchFlags;       ///< Flags for a specific search, e.g. #SEARC
 
 struct SearchState *search_state_new(void);
 void search_state_free(struct SearchState **search);
+
+#endif /* MUTT_PATTERN_SEARCH_STATE_H */