Changeset 5457:7729b1ad530c

Timestamp:

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

Author:

Aron Griffis <agriffis@…>

Branch:

HEAD

Message:

Unify mutt_write_references

copy.c and sendlib.c have independent and different implementations of writing
references to a file. Choose the one in sendlib since it's conservative with
mallocs and supports trimming the list.

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

Files:

• copy.c (modified) (2 diffs)
• protos.h (modified) (1 diff)
• sendlib.c (modified) (3 diffs)

copy.c

@@ -370 +370 @@
       {
         LIST *listp = h->env->in_reply_to;
-        fputs ("In-Reply-To: ", out);
+        fputs ("In-Reply-To:", out);
         for (; listp; listp = listp->next)
         {
+          fputc (' ', out);
           fputs (listp->data, out);
-          fputc (' ', out);
         }
         fputc ('\n', out);
@@ -382 +382 @@
       {
         LIST *listp = h->env->references, *refs = NULL, *t;
-        fputs ("References: ", out);
-
-        /* Mutt stores references in reverse order, thus we create
-         * a reordered refs list that we can put in the headers */
-        for (; listp; listp = listp->next, refs = t)
-        {
-          t = (LIST *)safe_malloc (sizeof (LIST));
-          t->data = listp->data;
-          t->next = refs;
-        }
-
-        for (; refs; refs = refs->next)
-        {
-          fputs (refs->data, out);
-          fputc (' ', out);
-        }
-
-        /* clearing refs from memory */
-        for (t = refs; refs; refs = t->next, t = refs)
-          FREE (&refs);
-
+        fputs ("References:", out);
+        mutt_write_references (h->env->references, out, 0);
         fputc ('\n', out);
       }

protos.h

@@ -372 +372 @@
 int mutt_write_one_header (FILE *fp, const char *tag, const char *value, const char *pfx, int wraplen);
 int mutt_write_rfc822_header (FILE *, ENVELOPE *, BODY *, int, int);
+void mutt_write_references (LIST *, FILE *, int);
 int mutt_yesorno (const char *, int);
 void mutt_set_header_color(CONTEXT *, HEADER *);

sendlib.c

@@ -1521 +1521 @@
 #define REF_INC 16
 
-#define TrimRef 10
-
 /* need to write the list in reverse because they are stored in reverse order
  * when parsed to speed up threading
  */
-static void write_references (LIST *r, FILE *f)
+void mutt_write_references (LIST *r, FILE *f, int trim)
 {
   LIST **ref = NULL;
   int refcnt = 0, refmax = 0;
 
-  for ( ; (TrimRef == 0 || refcnt < TrimRef) && r ; r = r->next)
+  for ( ; (trim == 0 || refcnt < trim) && r ; r = r->next)
   {
     if (refcnt == refmax)
@@ -1826 +1824 @@
     {
       fputs ("References:", fp);
-      write_references (env->references, fp);
+      mutt_write_references (env->references, fp, 10);
       fputc('\n', fp);
     }
@@ -1838 +1836 @@
   {
     fputs ("In-Reply-To:", fp);
-    write_references (env->in_reply_to, fp);
+    mutt_write_references (env->in_reply_to, fp, 1);
     fputc ('\n', fp);
   }