Changeset 5456:651ffe277dfd

Timestamp:

2008-07-10 06:38:25 (5 months ago)

Author:

Aron Griffis <agriffis@…>

Branch:

HEAD

Message:

Clean up error handling in mutt_copy_header

mutt_copy_header unnecessarily tests the result of each fputc/fputs (well, most
of them anyway, it's not consistent). This obfuscates the code and hides bugs.
Remove these extraneous checks since ferror/feof are checked at the bottom of
the function, and get rid of all the early returns.

Signed-off-by: Aron Griffis <agriffis@…>

Files:

• copy.c (modified) (8 diffs)

copy.c

@@ -349 +349 @@
   
   if (mutt_copy_hdr (in, out, h->offset, h->content->offset, flags, prefix) == -1)
-    return (-1);
+    return -1;
 
   if (flags & CH_TXTPLAIN)
@@ -361 +361 @@
     fputs(buffer, out);
     fputc('\n', out);
-    
-    if (ferror (out) != 0 || feof (out) != 0)
-      return -1;
-    
   }
 
@@ -374 +370 @@
       {
         LIST *listp = h->env->in_reply_to;
-
-        if (fputs ("In-Reply-To: ", out) == EOF)
-          return (-1);
-
+        fputs ("In-Reply-To: ", out);
         for (; listp; listp = listp->next)
-          if ((fputs (listp->data, out) == EOF) || (fputc (' ', out) == EOF))
-            return (-1);
-
-        if (fputc ('\n', out) == EOF)
-          return (-1);
+        {
+          fputs (listp->data, out);
+          fputc (' ', out);
+        }
+        fputc ('\n', out);
       }
 
@@ -389 +382 @@
       {
         LIST *listp = h->env->references, *refs = NULL, *t;
-
-        if (fputs ("References: ", out) == EOF)
-          return (-1);
+        fputs ("References: ", out);
 
         /* Mutt stores references in reverse order, thus we create
@@ -403 +394 @@
 
         for (; refs; refs = refs->next)
-          if ((fputs (refs->data, out) == EOF) || (fputc (' ', out) == EOF))
-            return (-1);
+        {
+          fputs (refs->data, out);
+          fputc (' ', out);
+        }
 
         /* clearing refs from memory */
@@ -410 +403 @@
           FREE (&refs);
 
-        if (fputc ('\n', out) == EOF)
-          return (-1);
+        fputc ('\n', out);
       }
 
       if (h->old || h->read)
       {
-        if (fputs ("Status: ", out) == EOF)
-          return (-1);
-
+        fputs ("Status: ", out);
         if (h->read)
-        {
-          if (fputs ("RO", out) == EOF)
-            return (-1);
-        }
+          fputs ("RO", out);
         else if (h->old)
-        {
-          if (fputc ('O', out) == EOF)
-            return (-1);
-        }
-
-        if (fputc ('\n', out) == EOF)
-          return (-1);
+          fputc ('O', out);
+        fputc ('\n', out);
       }
 
       if (h->flagged || h->replied)
       {
-        if (fputs ("X-Status: ", out) == EOF)
-          return (-1);
-
+        fputs ("X-Status: ", out);
         if (h->replied)
-        {
-          if (fputc ('A', out) == EOF)
-            return (-1);
-        }
-
+          fputc ('A', out);
         if (h->flagged)
-        {
-          if (fputc ('F', out) == EOF)
-            return (-1);
-        }
-        
-        if (fputc ('\n', out) == EOF)
-          return (-1);
+          fputc ('F', out);
+        fputc ('\n', out);
       }
     }
@@ -469 +440 @@
     if (flags & CH_PREFIX)
       fputs(prefix, out);
-    if (fputc ('\n', out) == EOF) /* add header terminator */
-      return (-1);
+    fputc ('\n', out); /* add header terminator */
   }
 
@@ -476 +446 @@
     return -1;
   
-  return (0);
+  return 0;
 }