X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=nntp%2Fnewsrc.c;h=6d5fad5c172af70015d7fddf58d24ac18556db88;hp=178594ee6d1ccac2639a3fab7ba69284e822f56c;hb=15d63145b9f11a1fa58c74abbeab7533ea2e5d21;hpb=688ac22f746f785c27ac99ac86aa85a3035a3638

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 178594e..6d5fad5 100644
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -237,10 +237,12 @@ static int nntp_parse_cacheindex (NNTP_SERVER * news)
   return 0;
 }
 
-const char *nntp_format_str (char *dest, ssize_t destlen, char op,
-                             const char *src, const char *fmt,
-                             const char *ifstring, const char *elsestring,
-                             unsigned long data, format_flag flags)
+const char *nntp_format_str(char *dest, ssize_t destlen, char op,
+                            const char *src, const char *fmt,
+                            const char *ifstr __attribute__((unused)),
+                            const char *elstr __attribute__((unused)),
+                            anytype data __attribute__((unused)),
+                            format_flag flags __attribute__((unused)))
 {
   char fn[STRING], tmp[STRING];
 
@@ -344,9 +346,8 @@ NNTP_SERVER *mutt_select_newsserver (char *server)
   if (!conn)
     return NULL;
 
-  mutt_FormatString (file, sizeof (file), NONULL (NewsRc), nntp_format_str, 0,
-                     0);
-  mutt_expand_path (file, sizeof (file));
+  m_strformat(file, sizeof(file), 0, NewsRc, nntp_format_str, NULL, 0);
+  mutt_expand_path(file, sizeof(file));
 
   serv = (NNTP_SERVER *) conn->data;
   if (serv) {