X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=nntp%2Fnewsrc.c;h=2c95d8b55a502b47990977972a19a91f3ef7294e;hb=1eeaaac6bdcad962c41bf975a32078cc4a0e578c;hp=134040c9f5de6e6d438a3f27a85974c4d35b5436;hpb=928ca0d87eb15bfa4c150abdadadaf3b177f95bd;p=apps%2Fmadmutt.git

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 134040c..2c95d8b 100644
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -242,7 +242,7 @@ const char *nntp_format_str (char *dest, ssize_t destlen, char op,
                              const char *ifstring, const char *elsestring,
                              unsigned long data, format_flag flags)
 {
-  char fn[SHORT_STRING], tmp[SHORT_STRING];
+  char fn[STRING], tmp[STRING];
 
   switch (op) {
   case 's':
@@ -344,7 +344,7 @@ NNTP_SERVER *mutt_select_newsserver (char *server)
   if (!conn)
     return NULL;
 
-  mutt_FormatString (file, sizeof (file), NONULL (NewsRc), nntp_format_str, 0,
+  m_strformat (file, sizeof (file), NONULL (NewsRc), nntp_format_str, 0,
                      0);
   mutt_expand_path (file, sizeof (file));
 
@@ -896,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",