X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;h=68b91650f9f9274eb924b1f1744e985f28af5d8a;hp=09b281af08db8d43e8f01c6b1e4c585b55b81093;hb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd

diff --git a/buffy.c b/buffy.c
index 09b281a..68b9165 100644
--- a/buffy.c
+++ b/buffy.c
@@ -15,11 +15,11 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/buffer.h>
 #include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffy.h"
-#include "buffer.h"
 #include "mx.h"
 #include "mh.h"
 #include "sidebar.h"
@@ -60,7 +60,7 @@ static int fseeko_last_message (FILE * f)
   int bytes_read;
   int i;                        /* Index into `buffer' for scanning.  */
 
-  memset (buffer, 0, sizeof (buffer));
+  p_clear(buffer, 1);
   fseeko (f, 0, SEEK_END);
   pos = ftello (f);
 
@@ -79,7 +79,7 @@ static int fseeko_last_message (FILE * f)
     if (bytes_read == -1)
       return -1;
     for (i = bytes_read; --i >= 0;)
-      if (!str_ncmp (buffer + i, "\n\nFrom ", m_strlen("\n\nFrom "))) { /* found it - go to the beginning of the From */
+      if (!m_strncmp(buffer + i, "\n\nFrom ", m_strlen("\n\nFrom "))) { /* found it - go to the beginning of the From */
         fseeko (f, pos + i + 2, SEEK_SET);
         return 0;
       }
@@ -87,7 +87,7 @@ static int fseeko_last_message (FILE * f)
   }
 
   /* here we are at the beginning of the file */
-  if (!str_ncmp ("From ", buffer, 5)) {
+  if (!m_strncmp("From ", buffer, 5)) {
     fseeko (f, 0, 0);
     return (0);
   }