simplifications

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/recvcmd.c b/recvcmd.c
index d3059ff..d9dd323 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -29,69 +29,56 @@
 /* some helper functions to verify that we are exclusively operating
  * on message/rfc822 attachments
  */
-
-static short check_msg (BODY * b, short err)
+static int check_all_msg(ATTACHPTR **idx, int idxlen, BODY *cur, bool err)
 {
-  if (!mutt_is_message_type(b)) {
-    if (err)
-      mutt_error _("You may only bounce message/rfc822 parts.");
-
-    return -1;
-  }
-  return 0;
-}
+    if (cur) {
+        if (!mutt_is_message_type(cur))
+            goto error;
+    } else {
+        for (int i = 0; i < idxlen; i++) {
+            BODY *b = idx[i]->content;
+            if (b->tagged && !mutt_is_message_type(b))
+                goto error;
+        }
+    }
+    return 0;
 
-static short check_all_msg (ATTACHPTR ** idx, short idxlen,
-                            BODY * cur, short err)
-{
-  short i;
+  error:
+    if (err)
+        mutt_error(_("You may only bounce message/rfc822 parts."));
 
-  if (cur && check_msg (cur, err) == -1)
     return -1;
-  else if (!cur) {
-    for (i = 0; i < idxlen; i++) {
-      if (idx[i]->content->tagged) {
-        if (check_msg (idx[i]->content, err) == -1)
-          return -1;
-      }
-    }
-  }
-  return 0;
 }
 
-
 /* can we decode all tagged attachments? */
-
-static short check_can_decode (ATTACHPTR ** idx, short idxlen, BODY * cur)
+static int check_can_decode(ATTACHPTR ** idx, int idxlen, BODY * cur)
 {
-  short i;
-
-  if (cur)
-    return mutt_can_decode (cur);
+    if (cur)
+        return mutt_can_decode(cur);
 
-  for (i = 0; i < idxlen; i++)
-    if (idx[i]->content->tagged && !mutt_can_decode (idx[i]->content))
-      return 0;
+    for (int i = 0; i < idxlen; i++) {
+        if (idx[i]->content->tagged && !mutt_can_decode(idx[i]->content))
+            return 0;
+    }
 
-  return 1;
+    return -1;
 }
 
-static short count_tagged (ATTACHPTR ** idx, short idxlen)
+static int count_tagged(ATTACHPTR **idx, int idxlen)
 {
-  short count = 0;
-  short i;
+    int count = 0;
 
-  for (i = 0; i < idxlen; i++)
-    if (idx[i]->content->tagged)
-      count++;
+    for (int i = 0; i < idxlen; i++) {
+        if (idx[i]->content->tagged)
+            count++;
+    }
 
-  return count;
+    return count;
 }
 
 /* count the number of tagged children below a multipart or message
  * attachment.
  */
-
 static short count_tagged_children (ATTACHPTR ** idx, short idxlen, short i)
 {
   short level = idx[i]->level;
@@ -103,7 +90,6 @@ static short count_tagged_children (ATTACHPTR ** idx, short idxlen, short i)
 
   return count;
 }
-\f
 
 
 /**
@@ -198,7 +184,6 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
     mutt_error (p ? _("Error bouncing message!") :
                 _("Error bouncing messages!"));
 }
-\f
 
 
 /**
@@ -221,7 +206,6 @@ void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTAC
         mutt_resend_message (fp, Context, idx[i]->content->hdr);
   }
 }
-\f
 
 /**
  ** forward-message, from the attachment menu 
@@ -671,14 +655,13 @@ void mutt_attach_forward (FILE * fp, HEADER * hdr,
   short nattach;
 
 
-  if (check_all_msg (idx, idxlen, cur, 0) == 0)
+  if (check_all_msg (idx, idxlen, cur, 0) == 0) {
     attach_forward_msgs (fp, hdr, idx, idxlen, cur, flags);
-  else {
+  } else {
     nattach = count_tagged (idx, idxlen);
     attach_forward_bodies (fp, hdr, idx, idxlen, cur, nattach, flags);
   }
 }
-\f
 
 
 /**