From: Richard Russon <rich@flatcap.org>
Date: Tue, 26 Feb 2019 23:35:52 +0000 (+0000)
Subject: add typedef for TokenFlags
X-Git-Tag: 2019-10-25~347^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=532b06781cb06198bf82a78e04edf9c087ac7162;p=neomutt

add typedef for TokenFlags
---

diff --git a/hook.c b/hook.c
index 231eed410..d365ad695 100644
--- a/hook.c
+++ b/hook.c
@@ -114,7 +114,7 @@ enum CommandResult mutt_parse_hook(struct Buffer *buf, struct Buffer *s,
                      (data & (MUTT_FOLDER_HOOK | MUTT_SEND_HOOK | MUTT_SEND2_HOOK |
                               MUTT_ACCOUNT_HOOK | MUTT_REPLY_HOOK)) ?
                          MUTT_TOKEN_SPACE :
-                         0);
+                         MUTT_TOKEN_NO_FLAGS);
 
   if (!command.data)
   {
diff --git a/init.c b/init.c
index 80a2b9efa..36d7c71a6 100644
--- a/init.c
+++ b/init.c
@@ -2673,11 +2673,11 @@ int mutt_dump_variables(bool hide_sensitive)
  * mutt_extract_token - Extract one token from a string
  * @param dest  Buffer for the result
  * @param tok   Buffer containing tokens
- * @param flags Flags, e.g. #MUTT_TOKEN_SPACE
+ * @param flags Flags, see #TokenFlags
  * @retval  0 Success
  * @retval -1 Error
  */
-int mutt_extract_token(struct Buffer *dest, struct Buffer *tok, int flags)
+int mutt_extract_token(struct Buffer *dest, struct Buffer *tok, TokenFlags flags)
 {
   if (!dest || !tok)
     return -1;
diff --git a/mutt.h b/mutt.h
index e5fffe8b9..03a768842 100644
--- a/mutt.h
+++ b/mutt.h
@@ -69,7 +69,8 @@ typedef uint16_t CompletionFlags;    ///< Flags for mutt_enter_string_full(), e.
 #define MUTT_NM_QUERY      (1 << 9)  ///< Notmuch query mode.
 #define MUTT_NM_TAG        (1 << 10) ///< Notmuch tag +/- mode.
 
-/* flags for mutt_extract_token() */
+typedef uint16_t TokenFlags;               ///< Flags for mutt_extract_token(), e.g. #MUTT_TOKEN_EQUAL
+#define MUTT_TOKEN_NO_FLAGS            0   ///< No flags are set
 #define MUTT_TOKEN_EQUAL         (1 << 0)  ///< Treat '=' as a special
 #define MUTT_TOKEN_CONDENSE      (1 << 1)  ///< ^(char) to control chars (macros)
 #define MUTT_TOKEN_SPACE         (1 << 2)  ///< Don't treat whitespace as a term
@@ -211,7 +212,7 @@ int safe_asprintf(char **, const char *, ...);
 
 char *mutt_compile_help(char *buf, size_t buflen, int menu, const struct Mapping *items);
 
-int mutt_extract_token(struct Buffer *dest, struct Buffer *tok, int flags);
+int mutt_extract_token(struct Buffer *dest, struct Buffer *tok, TokenFlags flags);
 void mutt_free_opts(void);
 int query_quadoption(int opt, const char *prompt);
 int mutt_label_complete(char *buf, size_t buflen, int numtabs);