stop building doc/ atm

[apps/madmutt.git] / color.c

diff --git a/color.c b/color.c
index 1e81ecb..4166468 100644 (file)
--- a/color.c
+++ b/color.c
@@ -16,10 +16,10 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/buffer.h>
+#include <lib-lib/mapping.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"
-#include "mapping.h"
 
 #include "lib/debug.h"
 
@@ -162,21 +162,21 @@ static char *get_color_name (char *dest, size_t destlen, int val)
 
   switch (val) {
   case COLOR_YELLOW:
-    strfcpy (dest, missing[0], destlen);
+    m_strcpy(dest, destlen, missing[0]);
     return dest;
 
   case COLOR_WHITE:
-    strfcpy (dest, missing[1], destlen);
+    m_strcpy(dest, destlen, missing[1]);
     return dest;
 
   case COLOR_DEFAULT:
-    strfcpy (dest, missing[2], destlen);
+    m_strcpy(dest, destlen, missing[2]);
     return dest;
   }
 
   for (i = 0; Colors[i].name; i++) {
     if (Colors[i].value == val) {
-      strfcpy (dest, Colors[i].name, destlen);
+      m_strcpy(dest, destlen, Colors[i].name);
       return dest;
     }
   }
@@ -351,7 +351,7 @@ int mutt_parse_unmono (BUFFER * buf, BUFFER * s, unsigned long data,
 }
 
 static int
-_mutt_parse_uncolor (BUFFER * buf, BUFFER * s, unsigned long data,
+_mutt_parse_uncolor (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
                      BUFFER * err, short parse_uncolor)
 {
   int object = 0, do_cache = 0;
@@ -490,7 +490,7 @@ add_pattern (COLOR_LINE ** top, const char *s, int sensitive,
     if (is_index) {
       int i;
 
-      strfcpy (buf, NONULL (s), sizeof (buf));
+      m_strcpy(buf, sizeof(buf), NONULL(s));
       mutt_check_simple (buf, sizeof (buf), NONULL (SimpleSearch));
       if ((tmp->color_pattern =
            mutt_pattern_comp (buf, M_FULL_MSG, err)) == NULL) {
@@ -532,7 +532,7 @@ parse_object (BUFFER * buf, BUFFER * s, int *o, int *ql, BUFFER * err)
   char *eptr;
 
   if (!MoreArgs (s)) {
-    strfcpy (err->data, _("Missing arguments."), err->dsize);
+    m_strcpy(err->data, err->dsize, _("Missing arguments."));
     return -1;
   }
 
@@ -568,7 +568,7 @@ parse_color_pair (BUFFER * buf, BUFFER * s, int *fg, int *bg, int *attr,
                   BUFFER * err)
 {
   if (!MoreArgs (s)) {
-    strfcpy (err->data, _("color: too few arguments"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("color: too few arguments"));
     return (-1);
   }
 
@@ -578,7 +578,7 @@ parse_color_pair (BUFFER * buf, BUFFER * s, int *fg, int *bg, int *attr,
     return (-1);
 
   if (!MoreArgs (s)) {
-    strfcpy (err->data, _("color: too few arguments"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("color: too few arguments"));
     return (-1);
   }
 
@@ -603,7 +603,7 @@ parse_attr_spec (BUFFER * buf, BUFFER * s, int *fg, int *bg, int *attr,
     *bg = -1;
 
   if (!MoreArgs (s)) {
-    strfcpy (err->data, _("mono: too few arguments"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("mono: too few arguments"));
     return (-1);
   }
 
@@ -661,7 +661,7 @@ _mutt_parse_color (BUFFER * buf, BUFFER * s, BUFFER * err,
   if (object == MT_COLOR_HEADER || object == MT_COLOR_BODY
       || object == MT_COLOR_INDEX) {
     if (!MoreArgs (s)) {
-      strfcpy (err->data, _("too few arguments"), err->dsize);
+      m_strcpy(err->data, err->dsize, _("too few arguments"));
       return (-1);
     }
 
@@ -669,7 +669,7 @@ _mutt_parse_color (BUFFER * buf, BUFFER * s, BUFFER * err,
   }
 
   if (MoreArgs (s)) {
-    strfcpy (err->data, _("too many arguments"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("too many arguments"));
     return (-1);
   }
 
@@ -685,7 +685,7 @@ _mutt_parse_color (BUFFER * buf, BUFFER * s, BUFFER * err,
       /* delay use_default_colors() until needed, since it initializes things */
       && (fg == COLOR_DEFAULT || bg == COLOR_DEFAULT)
       && use_default_colors () != OK) {
-    strfcpy (err->data, _("default colors not supported"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("default colors not supported"));
     return (-1);
   }
 # endif /* HAVE_USE_DEFAULT_COLORS */
@@ -734,7 +734,7 @@ _mutt_parse_color (BUFFER * buf, BUFFER * s, BUFFER * err,
 
 #ifdef HAVE_COLOR
 
-int mutt_parse_color (BUFFER * buff, BUFFER * s, unsigned long data,
+int mutt_parse_color (BUFFER * buff, BUFFER * s, unsigned long data __attribute__ ((unused)),
                       BUFFER * err)
 {
   int dry_run = 0;
@@ -747,7 +747,7 @@ int mutt_parse_color (BUFFER * buff, BUFFER * s, unsigned long data,
 
 #endif
 
-int mutt_parse_mono (BUFFER * buff, BUFFER * s, unsigned long data,
+int mutt_parse_mono (BUFFER * buff, BUFFER * s, unsigned long data __attribute__ ((unused)),
                      BUFFER * err)
 {
   int dry_run = 0;