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

diff --git a/buffy.c b/buffy.c
index 09b281a..ff316cc 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);
   }
@@ -176,7 +176,7 @@ static void buffy_free (BUFFY** p) {
 }
 
 int buffy_lookup (const char* path) {
-  int i = 0;
+  unsigned int i = 0;
   if (list_empty(Incoming) || !path || !*path)
     return (-1);
   for (i = 0; i < Incoming->length; i++) {
@@ -187,7 +187,7 @@ int buffy_lookup (const char* path) {
 }
 
 int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data,
-                          BUFFER * err)
+                          BUFFER * err __attribute__ ((unused)))
 {
   BUFFY* tmp;
   char buf[_POSIX_PATH_MAX];
@@ -198,7 +198,7 @@ int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data,
 
   while (MoreArgs (s)) {
     mutt_extract_token (path, s, 0);
-    strfcpy (buf, path->data, sizeof (buf));
+    m_strcpy(buf, sizeof(buf), path->data);
 
     if (data == M_UNMAILBOXES && str_eq (buf, "*")) {
       list_del (&Incoming, (list_del_t*) buffy_free);
@@ -273,7 +273,8 @@ int buffy_check (int force)
   struct stat contex_sb;
   time_t now, last1;
   CONTEXT *ctx;
-  int i = 0, local = 0, count = 0;
+  unsigned int i = 0;
+  int local = 0, count = 0;
 #ifdef USE_IMAP
   time_t last2;
 
@@ -438,7 +439,6 @@ int buffy_check (int force)
             BuffyCount++;
           if (count) {
             DIR *dp;
-            struct dirent *de;
 
             if ((dp = opendir (path)) == NULL)
               break;
@@ -506,7 +506,7 @@ int buffy_list (void)
   int pos;
   int first;
   int have_unnotified = BuffyNotify;
-  int i = 0;
+  unsigned int i = 0;
 
   pos = 0;
   first = 1;
@@ -519,7 +519,7 @@ int buffy_list (void)
       if (tmp->new <= 0 || (have_unnotified && tmp->notified))
         continue;
 
-      strfcpy (path, tmp->path, sizeof (path));
+      m_strcpy(path, sizeof(path), tmp->path);
       mutt_pretty_mailbox (path);
 
       if (!first && pos + m_strlen(path) >= COLS - 7)
@@ -570,7 +570,8 @@ int buffy_notify (void)
  */
 void buffy_next (char *s, size_t slen)
 {
-  int i = 0, c = 0, l = 0;
+  unsigned int l = 0;
+  int c = 0, i = 0;
 
   if (list_empty(Incoming))
     return;
@@ -600,7 +601,7 @@ void buffy_next (char *s, size_t slen)
      * reported new mail */
     buffy_check (0);
   } else {
-    strfcpy (s, ((BUFFY*) Incoming->data[c])->path, slen);
+    m_strcpy(s, slen, ((BUFFY*)Incoming->data[c])->path);
     mutt_pretty_mailbox (s);
   }
 }