Boolify mutt_nm_tag_complete and mutt_nm_query_complete

Issue: #492

diff --git a/init.c b/init.c
index 8aebe65c80a119b58df9e7163ecb90a7c8229aa7..e530a8685cacb0a04216b61ba07844ee4bb4ad6c 100644 (file)
--- a/init.c
+++ b/init.c
@@ -3384,7 +3384,7 @@ static const char* rstrnstr(const char* haystack,
 }
 
 /* Complete the nearest "tag:"-prefixed string previous to pos. */
-int mutt_nm_query_complete (char *buffer, size_t len, int pos, int numtabs)
+bool mutt_nm_query_complete (char *buffer, size_t len, int pos, int numtabs)
 {
   char *pt = buffer;
   int spaces;
@@ -3403,11 +3403,11 @@ int mutt_nm_query_complete (char *buffer, size_t len, int pos, int numtabs)
        * i.e. don't change 'buffer'. Fake successful return this time.
        */
       if (User_typed[0] == 0)
-       return 1;
+       return true;
     }
 
     if (Completed[0] == 0 && User_typed[0])
-      return 0;
+      return false;
 
     /* Num_matched will _always_ be at least 1 since the initial
      * user-typed string is always stored */
@@ -3422,16 +3422,16 @@ int mutt_nm_query_complete (char *buffer, size_t len, int pos, int numtabs)
     strncpy (pt, Completed, buffer + len - pt - spaces);
   }
   else
-    return 0;
+    return false;
 
-  return 1;
+  return true;
 }
 
 /* Complete the nearest "+" or "-" -prefixed string previous to pos. */
-int mutt_nm_tag_complete (char *buffer, size_t len, int pos, int numtabs)
+bool mutt_nm_tag_complete (char *buffer, size_t len, int pos, int numtabs)
 {
   if (!buffer)
-    return 0;
+    return false;
 
   char *pt = buffer;
 
@@ -3453,11 +3453,11 @@ int mutt_nm_tag_complete (char *buffer, size_t len, int pos, int numtabs)
       * i.e. don't change 'buffer'. Fake successful return this time.
       */
     if (User_typed[0] == 0)
-      return 1;
+      return true;
   }
 
   if (Completed[0] == 0 && User_typed[0])
-    return 0;
+    return false;
 
   /* Num_matched will _always_ be at least 1 since the initial
     * user-typed string is always stored */
@@ -3471,7 +3471,7 @@ int mutt_nm_tag_complete (char *buffer, size_t len, int pos, int numtabs)
   /* return the completed query */
   strncpy (pt, Completed, buffer + len - pt);
 
-  return 1;
+  return true;
 }
 #endif
 

diff --git a/protos.h b/protos.h
index 45f2b744652013c208cdeb5e8cb6abcd84a08dcc..9f09395676e7d28246ffeb702b0bb06a47e7076f 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -296,8 +296,8 @@ int mutt_check_traditional_pgp(HEADER *h, int *redraw);
 int mutt_command_complete(char *buffer, size_t len, int pos, int numtabs);
 int mutt_var_value_complete(char *buffer, size_t len, int pos);
 #ifdef USE_NOTMUCH
-int mutt_nm_query_complete(char *buffer, size_t len, int pos, int numtabs);
-int mutt_nm_tag_complete(char *buffer, size_t len, int pos, int numtabs);
+bool mutt_nm_query_complete(char *buffer, size_t len, int pos, int numtabs);
+bool mutt_nm_tag_complete(char *buffer, size_t len, int pos, int numtabs);
 #endif
 int mutt_complete(char *s, size_t slen);
 int mutt_compose_attachment(BODY *a);