X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.c;h=cefe0ec1cb7e3a662be74dfc28341f7a8097c52a;hp=f0f129df784bd737a57625a631481cf36f363b0d;hb=48a027c4e8a676bc53de48f88b09d34347c23f28;hpb=ecfcc6df70230ba136c2fb3843700ecb749c41b7

diff --git a/alias.c b/alias.c
index f0f129d..cefe0ec 100644
--- a/alias.c
+++ b/alias.c
@@ -20,16 +20,15 @@
 #include <lib-lib/file.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/mapping.h>
+#include <lib-lib/debug.h>
+#include <lib-lib/rx.h>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
-
-#include "lib/rx.h"
-#include "lib/debug.h"
+#include <lib-ui/menu.h>
 
 #include "mutt.h"
 #include "mutt_idna.h"
-#include "mutt_menu.h"
 #include "sort.h"
 
 #define RSORT(x) (SortAlias & SORT_REVERSE) ? -x : x
@@ -405,7 +404,7 @@ int mutt_alias_complete (char *s, size_t buflen)
 #define min(a,b)        ((a<b)?a:b)
 
   if (s[0] != 0) {              /* avoid empty string as strstr argument */
-    p_clear(bestname, sizeof(bestname));
+    p_clear(bestname, countof(bestname));
 
     while (a) {
       if (a->name && strstr (a->name, s) == a->name) {