build: use SEEK_SET, SEEK_CUR, SEEK_END

Change all the uses of fseek() and fseeko() to use defined constants:
    SEEK_SET, SEEK_CUR, SEEK_END

diff --git a/attach.c b/attach.c
index ebf42ad088238a185932eca3c5990c92b3ed3fd6..04c22e7cec2ebed180b089189302857a68aa9ec5 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -165,7 +165,7 @@ int mutt_compose_attachment (BODY *a)
 
            /* Remove headers by copying out data to another file, then
             * copying the file back */
-           fseeko (fp, b->offset, 0);
+           fseeko (fp, b->offset, SEEK_SET);
            mutt_mktemp (tempfile, sizeof (tempfile));
            if ((tfp = safe_fopen (tempfile, "w")) == NULL)
            {
@@ -726,7 +726,7 @@ int mutt_save_attachment (FILE *fp, BODY *m, char *path, int flags, HEADER *hdr)
       hn->msgno = hdr->msgno; /* required for MH/maildir */
       hn->read = 1;
 
-      fseeko (fp, m->offset, 0);
+      fseeko (fp, m->offset, SEEK_SET);
       if (fgets (buf, sizeof (buf), fp) == NULL)
        return -1;
       if (mx_open_mailbox(path, MUTT_APPEND | MUTT_QUIET, &ctx) == NULL)
@@ -762,7 +762,7 @@ int mutt_save_attachment (FILE *fp, BODY *m, char *path, int flags, HEADER *hdr)
        mutt_sleep (2);
        return -1;
       }
-      fseeko ((s.fpin = fp), m->offset, 0);
+      fseeko ((s.fpin = fp), m->offset, SEEK_SET);
       mutt_decode_attachment (m, &s);
 
       if (safe_fsync_close (&s.fpout) != 0)

diff --git a/buffy.c b/buffy.c
index 74dddde4ed89efbab09a3c8f9d18481b615befcd..01860ca7f2f188b47a03549852c38b09c1a9d934 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -93,7 +93,7 @@ static int fseek_last_message (FILE * f)
   /* here we are at the beginning of the file */
   if (mutt_strncmp ("From ", buffer, 5) == 0)
   {
-    fseek (f, 0, 0);
+    fseek (f, 0, SEEK_SET);
     return 0;
   }
 

diff --git a/copy.c b/copy.c
index f449a19bfd50e26f647c387adcbc7a4f30ba37a6..e4158cc51c0a226268adc9a2a0234e5572f615a5 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -61,7 +61,7 @@ mutt_copy_hdr (FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end, int flags,
   int error;
 
   if (ftello (in) != off_start)
-    fseeko (in, off_start, 0);
+    fseeko (in, off_start, SEEK_SET);
 
   buf[0] = '\n';
   buf[1] = 0;
@@ -675,7 +675,7 @@ _mutt_copy_message (FILE *fpout, FILE *fpin, HEADER *hdr, BODY *body,
     mutt_write_mime_header (cur, fpout);
     fputc ('\n', fpout);
 
-    fseeko (fp, cur->offset, 0);
+    fseeko (fp, cur->offset, SEEK_SET);
     if (mutt_copy_bytes (fp, fpout, cur->length) == -1)
     {
       safe_fclose (&fp);
@@ -687,7 +687,7 @@ _mutt_copy_message (FILE *fpout, FILE *fpin, HEADER *hdr, BODY *body,
   }
   else
   {
-    fseeko (fpin, body->offset, 0);
+    fseeko (fpin, body->offset, SEEK_SET);
     if (flags & MUTT_CM_PREFIX)
     {
       int c;
@@ -757,7 +757,7 @@ _mutt_append_message (CONTEXT *dest, FILE *fpin, CONTEXT *src, HEADER *hdr,
   MESSAGE *msg = NULL;
   int r;
 
-  fseeko (fpin, hdr->offset, 0);
+  fseeko (fpin, hdr->offset, SEEK_SET);
   if (fgets (buf, sizeof (buf), fpin) == NULL)
     return -1;
 

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 68409625b935b34bbdd630aac0e4241ad7441275..c8b262e5e208819bff6af2408e9eb3d1042f246f 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -1858,7 +1858,7 @@ int pgp_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur)
     }
     unlink (tempfile);
 
-    fseeko (s.fpin, b->offset, 0);
+    fseeko (s.fpin, b->offset, SEEK_SET);
     s.fpout = decoded_fp;
 
     mutt_decode_attachment (b, &s);
@@ -1926,7 +1926,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur)
   saved_b_length = b->length;
   memset (&s, 0, sizeof (s));
   s.fpin = fpin;
-  fseeko (s.fpin, b->offset, 0);
+  fseeko (s.fpin, b->offset, SEEK_SET);
   mutt_mktemp (tempfile, sizeof (tempfile));
   if (!(tmpfp = safe_fopen (tempfile, "w+")))
     {
@@ -1980,7 +1980,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur)
       saved_b_length = bb->length;
       memset (&s, 0, sizeof (s));
       s.fpin = *fpout;
-      fseeko (s.fpin, bb->offset, 0);
+      fseeko (s.fpin, bb->offset, SEEK_SET);
       mutt_mktemp (tempfile, sizeof (tempfile));
       if (!(tmpfp = safe_fopen (tempfile, "w+")))
         {
@@ -2372,7 +2372,7 @@ int pgp_gpgme_application_handler (BODY *m, STATE *s)
   if (!mutt_get_body_charset (body_charset, sizeof (body_charset), m))
     strfcpy (body_charset, "iso-8859-1", sizeof (body_charset));
 
-  fseeko (s->fpin, m->offset, 0);
+  fseeko (s->fpin, m->offset, SEEK_SET);
   last_pos = m->offset;
 
   for (bytes = m->length; bytes > 0;)

diff --git a/crypt.c b/crypt.c
index a1705c18de831c8b383c47012fb396fd6f0c68a3..ca539ba938c6ec740150e7205966cf06106b6577 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -608,7 +608,7 @@ int crypt_write_signed(BODY *a, STATE *s, const char *tempfile)
     return -1;
   }
 
-  fseeko (s->fpin, a->hdr_offset, 0);
+  fseeko (s->fpin, a->hdr_offset, SEEK_SET);
   bytes = a->length + a->offset - a->hdr_offset;
   hadcr = 0;
   while (bytes > 0)

diff --git a/edit.c b/edit.c
index 90fc6695772213d46214a72ba98efa83d9802aae..118b210ebae7a05cc3cd35308630ae21e4ad8db5 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -75,7 +75,7 @@ be_snarf_data (FILE *f, char **buf, int *bufmax, int *buflen, LOFF_T offset,
     tmplen = sizeof (tmp) - tmplen;
   }
 
-  fseeko (f, offset, 0);
+  fseeko (f, offset, SEEK_SET);
   while (bytes > 0)
   {
     if (fgets (p, tmplen - 1, f) == NULL) break;

diff --git a/handler.c b/handler.c
index fdcfbc3344444529a781db55145f34fc4d54b0e8..f35b50c6f0d9058ff4e923000533faf41cf0a95d 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -1144,7 +1144,7 @@ static int alternative_handler (BODY *a, STATE *s)
   {
     if (s->flags & MUTT_DISPLAY && !option (OPTWEED))
     {
-      fseeko (s->fpin, choice->hdr_offset, 0);
+      fseeko (s->fpin, choice->hdr_offset, SEEK_SET);
       mutt_copy_bytes(s->fpin, s->fpout, choice->offset-choice->hdr_offset);
     }
 
@@ -1303,7 +1303,7 @@ static int multipart_handler (BODY *a, STATE *s)
       print_part_line (s, p, 0);
       if (!option (OPTWEED))
       {
-       fseeko (s->fpin, p->hdr_offset, 0);
+       fseeko (s->fpin, p->hdr_offset, SEEK_SET);
        mutt_copy_bytes(s->fpin, s->fpout, p->offset-p->hdr_offset);
       }
       else
@@ -1580,7 +1580,7 @@ void mutt_decode_attachment (BODY *b, STATE *s)
   else if (istext && b->charset)
     cd = mutt_iconv_open (Charset, b->charset, MUTT_ICONV_HOOK_FROM);
 
-  fseeko (s->fpin, b->offset, 0);
+  fseeko (s->fpin, b->offset, SEEK_SET);
   switch (b->encoding)
   {
     case ENCQUOTEDPRINTABLE:
@@ -1641,7 +1641,7 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
   int decode = 0;
   int rc = 0;
 
-  fseeko (s->fpin, b->offset, 0);
+  fseeko (s->fpin, b->offset, SEEK_SET);
 
 #ifdef USE_FMEMOPEN
   char *temp = NULL;

diff --git a/mbox.c b/mbox.c
index 069e0d5d2a2a405f63397a38dcf143d9bab249e6..6274fb2549bd943cd4babfd9e21fc850f0affbfe 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -473,7 +473,7 @@ static int mbox_open_mailbox_append (CONTEXT *ctx, int flags)
     return -1;
   }
 
-  fseek (ctx->fp, 0, 2);
+  fseek (ctx->fp, 0, SEEK_END);
 
   return 0;
 }

diff --git a/pager.c b/pager.c
index 3453b26ef5c4f95f744cf19df1b67981e7b535c8..1474665b21473d8148d9cee967e2d10dce833072 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1098,7 +1098,7 @@ fill_buffer (FILE *f, LOFF_T *last_pos, LOFF_T offset, unsigned char **buf,
   if (*buf_ready == 0)
   {
     if (offset != *last_pos)
-      fseeko (f, offset, 0);
+      fseeko (f, offset, SEEK_SET);
     if ((*buf = (unsigned char *) mutt_read_line ((char *) *buf, blen, f, &l, MUTT_EOL)) == NULL)
     {
       fmt[0] = 0;

diff --git a/parse.c b/parse.c
index 460d9ee5e312f13747be3893aa6e599996a26cb4..9068abf2c9514816a78fc1c432ebefaa5346ab65 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -1416,7 +1416,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE *f, HEADER *hdr, short user_hdrs,
        continue;
       }
 
-      fseeko (f, loc, 0);
+      fseeko (f, loc, SEEK_SET);
       break; /* end of header */
     }
 

diff --git a/pattern.c b/pattern.c
index 751aeb35e1eaf6156d5fd64ab880ce18910b627d..c1fe311d9cc8fe011f16d31fb8f91b8b3c00b0be 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -955,7 +955,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
          return 0;
        }
 
-       fseeko (msg->fp, h->offset, 0);
+       fseeko (msg->fp, h->offset, SEEK_SET);
        mutt_body_handler (h->content, &s);
       }
 
@@ -979,7 +979,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
 #else
       fp = s.fpout;
       fflush (fp);
-      fseek (fp, 0, 0);
+      fseek (fp, 0, SEEK_SET);
       fstat (fileno (fp), &st);
       lng = (long) st.st_size;
 #endif
@@ -990,13 +990,13 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
       fp = msg->fp;
       if (pat->op != MUTT_BODY)
       {
-       fseeko (fp, h->offset, 0);
+       fseeko (fp, h->offset, SEEK_SET);
        lng = h->content->offset - h->offset;
       }
       if (pat->op != MUTT_HEADER)
       {
        if (pat->op == MUTT_BODY)
-         fseeko (fp, h->content->offset, 0);
+         fseeko (fp, h->content->offset, SEEK_SET);
        lng += h->content->length;
       }
     }

diff --git a/pgp.c b/pgp.c
index ee64616e74d84507e3e574da4ee8e5e9e11496f0..683f4dbaa7d677caec365957006f0621edb3abc7 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -338,7 +338,7 @@ int pgp_application_pgp_handler (BODY *m, STATE *s)
 
   rc = 0;      /* silence false compiler warning if (s->flags & MUTT_DISPLAY) */
 
-  fseeko (s->fpin, m->offset, 0);
+  fseeko (s->fpin, m->offset, SEEK_SET);
   last_pos = m->offset;
 
   for (bytes = m->length; bytes > 0;)
@@ -702,7 +702,7 @@ int pgp_verify_one (BODY *sigbdy, STATE *s, const char *tempfile)
     return -1;
   }
 
-  fseeko (s->fpin, sigbdy->offset, 0);
+  fseeko (s->fpin, sigbdy->offset, SEEK_SET);
   mutt_copy_bytes (s->fpin, fp, sigbdy->length);
   safe_fclose (&fp);
 
@@ -834,7 +834,7 @@ static BODY *pgp_decrypt_part (BODY *a, STATE *s, FILE *fpout, BODY *p)
    * the temporary file.
    */
 
-  fseeko (s->fpin, a->offset, 0);
+  fseeko (s->fpin, a->offset, SEEK_SET);
   mutt_copy_bytes (s->fpin, pgptmp, a->length);
   safe_fclose (&pgptmp);
 
@@ -961,7 +961,7 @@ int pgp_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur)
     }
     unlink (tempfile);
 
-    fseeko (s.fpin, b->offset, 0);
+    fseeko (s.fpin, b->offset, SEEK_SET);
     s.fpout = decoded_fp;
 
     mutt_decode_attachment (b, &s);

diff --git a/postpone.c b/postpone.c
index 8e10c837b70a4518ee087aef04521a1a08653a1d..d8dc71b6ac01bb63f0e648f4c302d0fc373c95f9 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -577,7 +577,7 @@ int mutt_prepare_template (FILE *fp, CONTEXT *ctx, HEADER *newhdr, HEADER *hdr,
 
   /* parse the message header and MIME structure */
 
-  fseeko (fp, hdr->offset, 0);
+  fseeko (fp, hdr->offset, SEEK_SET);
   newhdr->offset = hdr->offset;
   /* enable header weeding for resent messages */
   newhdr->env = mutt_read_rfc822_header (fp, newhdr, 1, resend);

diff --git a/sendlib.c b/sendlib.c
index 6c315b4d0435f968e15fb0f36609a68d698749ac..98cd4c7be26a85ef451c598f0fc20471d71a375c 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -1117,7 +1117,7 @@ void mutt_message_to_7bit (BODY *a, FILE *fp)
     goto cleanup;
   }
 
-  fseeko (fpin, a->offset, 0);
+  fseeko (fpin, a->offset, SEEK_SET);
   a->parts = mutt_parse_message_rfc822 (fpin, a);
 
   transform_to_7bit (a->parts, fpin);
@@ -2624,7 +2624,7 @@ static int _mutt_bounce_message (FILE *fp, HEADER *h, ADDRESS *to, const char *r
     if (!option (OPTBOUNCEDELIVERED))
       ch_flags |= CH_WEED_DELIVERED;
 
-    fseeko (fp, h->offset, 0);
+    fseeko (fp, h->offset, SEEK_SET);
     fprintf (f, "Resent-From: %s", resent_from);
     fprintf (f, "\nResent-%s", mutt_make_date (date, sizeof(date)));
     msgid_str = gen_msgid();
@@ -2952,10 +2952,10 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid,
      * this will happen, and it can cause problems parsing the mailbox
      * later.
      */
-    fseek (tempfp, -1, 2);
+    fseek (tempfp, -1, SEEK_END);
     if (fgetc (tempfp) != '\n')
     {
-      fseek (tempfp, 0, 2);
+      fseek (tempfp, 0, SEEK_END);
       fputc ('\n', tempfp);
     }
 

diff --git a/smime.c b/smime.c
index 307a77865baa12b6d06bf279ceb81642dcc6752a..df5d9c0e3aa267e105aa3b0478ed6fb04474f41a 100644 (file)
--- a/smime.c
+++ b/smime.c
@@ -1850,7 +1850,7 @@ static BODY *smime_handle_entity (BODY *m, STATE *s, FILE *outFile)
     return NULL;
   }
 
-  fseeko (s->fpin, m->offset, 0);
+  fseeko (s->fpin, m->offset, SEEK_SET);
 
   mutt_copy_bytes (s->fpin, tmpfp,  m->length);
 
@@ -2031,7 +2031,7 @@ int smime_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur)
 
   memset (&s, 0, sizeof (s));
   s.fpin = fpin;
-  fseeko (s.fpin, b->offset, 0);
+  fseeko (s.fpin, b->offset, SEEK_SET);
 
   mutt_mktemp (tempfile, sizeof (tempfile));
   if ((tmpfp = safe_fopen (tempfile, "w+")) == NULL)