remove yet anoter round of str_* functions, replaced with their inlineable

[apps/madmutt.git] / mbox.c

diff --git a/mbox.c b/mbox.c
index cab71ac..46d7291 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -313,7 +313,7 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
            */
           if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0 ||
               fgets (buf, sizeof (buf), ctx->fp) == NULL ||
            */
           if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0 ||
               fgets (buf, sizeof (buf), ctx->fp) == NULL ||

-              str_ncmp ("From ", buf, 5) != 0) {
+              m_strncmp("From ", buf, 5) != 0) {

             debug_print (1, ("bad content-length in message %d (cl=%zd)\n",
                              curhdr->index, curhdr->content->length));
             debug_print (1, ("LINE: %s\n", buf));
             debug_print (1, ("bad content-length in message %d (cl=%zd)\n",
                              curhdr->index, curhdr->content->length));
             debug_print (1, ("LINE: %s\n", buf));


@@ -470,7 +470,7 @@ static int _mbox_check_mailbox (CONTEXT * ctx, int *index_hint)
       if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0)
         debug_print (1, ("fseeko() failed\n"));
       if (fgets (buffer, sizeof (buffer), ctx->fp) != NULL) {
       if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0)
         debug_print (1, ("fseeko() failed\n"));
       if (fgets (buffer, sizeof (buffer), ctx->fp) != NULL) {

-        if ((ctx->magic == M_MBOX && str_ncmp ("From ", buffer, 5) == 0)
+        if ((ctx->magic == M_MBOX && m_strncmp("From ", buffer, 5) == 0)

             || (ctx->magic == M_MMDF && m_strcmp(MMDF_SEP, buffer) == 0)) {
           if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0)
             debug_print (1, ("fseeko() failed\n"));
             || (ctx->magic == M_MMDF && m_strcmp(MMDF_SEP, buffer) == 0)) {
           if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0)
             debug_print (1, ("fseeko() failed\n"));


@@ -752,7 +752,7 @@ static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
   if (fseeko (ctx->fp, offset, SEEK_SET) != 0 || /* seek the append location */
       /* do a sanity check to make sure the mailbox looks ok */
       fgets (buf, sizeof (buf), ctx->fp) == NULL ||
   if (fseeko (ctx->fp, offset, SEEK_SET) != 0 || /* seek the append location */
       /* do a sanity check to make sure the mailbox looks ok */
       fgets (buf, sizeof (buf), ctx->fp) == NULL ||

-      (ctx->magic == M_MBOX && str_ncmp ("From ", buf, 5) != 0) ||
+      (ctx->magic == M_MBOX && m_strncmp("From ", buf, 5) != 0) ||

       (ctx->magic == M_MMDF && m_strcmp(MMDF_SEP, buf) != 0)) {
     debug_print (1, ("message not in expected position.\n"));
     debug_print (1, ("LINE: %s\n", buf));
       (ctx->magic == M_MMDF && m_strcmp(MMDF_SEP, buf) != 0)) {
     debug_print (1, ("message not in expected position.\n"));
     debug_print (1, ("LINE: %s\n", buf));


@@ -1094,7 +1094,7 @@ int mbox_is_magic (const char* path, struct stat* st) {
     struct utimbuf times;
 #endif
     fgets (tmp, sizeof (tmp), f);
     struct utimbuf times;
 #endif
     fgets (tmp, sizeof (tmp), f);

-    if (str_ncmp ("From ", tmp, 5) == 0)
+    if (m_strncmp("From ", tmp, 5) == 0)

       magic = M_MBOX;
     else if (m_strcmp(MMDF_SEP, tmp) == 0)
       magic = M_MMDF;
       magic = M_MBOX;
     else if (m_strcmp(MMDF_SEP, tmp) == 0)
       magic = M_MMDF;