X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=nntp%2Fnewsrc.c;h=68e14fce93a037364f055085bd27da3df867c490;hp=349e3e763cdf33b3b665b6ac45c6022dd1cb6326;hb=f2ff91d8b7627e22af9715d384b6f9e9e802a39e;hpb=8d429041536e4508e8dd00b390721895dc324b9b

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 349e3e7..68e14fc 100644
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -511,15 +511,6 @@ static void nntp_create_newsrc_line (NNTP_DATA * data, char **buf,
       len--;
     }
 
-#if 0
-    if (data->entries[x].first == data->entries[x].last)
-      snprintf (line, len, "%d%n", data->entries[x].first, &i);
-    else
-      snprintf (line, len, "%d-%d%n",
-                data->entries[x].first, data->entries[x].last, &i);
-    len -= i;
-    line += i;
-#else
     i = puti (line, data->entries[x].first);
     line += i;
     len -= i;
@@ -530,7 +521,6 @@ static void nntp_create_newsrc_line (NNTP_DATA * data, char **buf,
       line += i;
       len -= i;
     }
-#endif
   }
   *line++ = '\n';
   *line = '\0';
@@ -906,7 +896,7 @@ int nntp_save_cache_group (CONTEXT * ctx)
     if (!ctx->hdrs[i]->deleted && ctx->hdrs[i]->article_num != prev) {
       h = ctx->hdrs[i];
       addr[0] = 0;
-      rfc822_write_address (addr, sizeof (addr), h->env->from, 0);
+      rfc822_addrcat(addr, sizeof(addr), h->env->from, 0);
       tm = gmtime (&h->date_sent);
       snprintf (buf, sizeof (buf),
                 "%d\t%s\t%s\t%d %s %d %02d:%02d:%02d GMT\t%s\t",