X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=a66f9b0a63f93998a1c9241b90859e1b49aeddf3;hp=3bed8200f1c11b32471a9298e8ea944249f899f0;hb=98f62b5fcbd680fd5214ee85e1635b84322cbdd1;hpb=d8c2844a5a8b0fcf09158dcdd452f6e43e29b5db

diff --git a/pager.c b/pager.c
index 3bed820..a66f9b0 100644
--- a/pager.c
+++ b/pager.c
@@ -29,7 +29,7 @@
 #include "charset.h"
 #include "buffy.h"
 
-#include <imap/imap_private.h>
+#include <imap/imap.h>
 
 #define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT)
 
@@ -336,7 +336,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
             class->color = ColorQuote[0];
             *QuoteList = class;
         }
-        return (*QuoteList);
+        return *QuoteList;
     }
 
     /* Did I mention how much I like emulating Lisp in C? */
@@ -733,7 +733,7 @@ static int is_ansi(unsigned char *buf)
 {
     while (isdigit(*buf) || *buf == ';')
         buf++;
-    return (*buf == 'm');
+    return *buf == 'm';
 }
 
 static int check_attachment_marker(char *p)
@@ -775,7 +775,7 @@ fill_buffer (FILE * f, off_t *last_pos, off_t offset, unsigned char *buf,
             fseeko (f, offset, 0);
         if (fgets ((char *) buf, blen - 1, f) == NULL) {
             fmt[0] = 0;
-            return (-1);
+            return -1;
         }
         *last_pos = ftello (f);
         b_read = (int) (*last_pos - offset);
@@ -1016,7 +1016,7 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
            &buf_ready) < 0) {
         if (change_last)
           (*last)--;
-        return (-1);
+        return -1;
       }
 
       resolve_types ((char *) fmt, (char *) buf, *lineInfo, n, *last,
@@ -1048,7 +1048,7 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
          &buf_ready) < 0) {
       if (change_last)
         (*last)--;
-      return (-1);
+      return -1;
     }
     regexec ((regex_t *) QuoteRegexp.rx, (char *) fmt, 1, pmatch, 0);
     (*lineInfo)[n].quote = classify_quote (QuoteList,
@@ -1064,7 +1064,7 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
          &buf_ready) < 0) {
       if (change_last)
         (*last)--;
-      return (-1);
+      return -1;
     }
 
     offset = 0;
@@ -1094,18 +1094,18 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
 
   if (!(flags & M_SHOW) && (*lineInfo)[n + 1].offset > 0) {
     /* we've already scanned this line, so just exit */
-    return (0);
+    return 0;
   }
   if ((flags & M_SHOWCOLOR) && *force_redraw && (*lineInfo)[n + 1].offset > 0) {
     /* no need to try to display this line... */
-    return (1);                 /* fake display */
+    return 1;                 /* fake display */
   }
 
   if ((b_read = fill_buffer (f, last_pos, (*lineInfo)[n].offset, buf, fmt,
                              sizeof (buf), &buf_ready)) < 0) {
     if (change_last)
       (*last)--;
-    return (-1);
+    return -1;
   }
 
   /* now chose a good place to break the line */
@@ -1188,7 +1188,7 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
   if (!(flags & M_SHOW))
     flags = 0;
 
-  return (flags);
+  return flags;
 }
 
 static int upNLines (int nlines, struct line_t *info, int cur, int hiding)
@@ -1242,13 +1242,13 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
   if ((fp = fopen (fname, "r")) == NULL) {
     mutt_perror (fname);
-    return (-1);
+    return -1;
   }
 
   if (stat (fname, &sb) != 0) {
     mutt_perror (fname);
     m_fclose(&fp);
-    return (-1);
+    return -1;
   }
   unlink (fname);
 
@@ -2267,7 +2267,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
   p_delete(&lineInfo);
   if (pager_index)
     mutt_menuDestroy (&pager_index);
-  return (rc != -1 ? rc : 0);
+  return rc != -1 ? rc : 0;
 }
 
 #undef CHECK_ATTACH