Change errors to warnings where applicable

diff --git a/color.c b/color.c
index 910f0683ec560976078fd8356ef8f67424209a2f..03fb2f96477ebd6948b60266f7c50e32aad0f961 100644 (file)
--- a/color.c
+++ b/color.c
@@ -607,13 +607,13 @@ static enum CommandResult parse_uncolor(struct Buffer *buf, struct Buffer *s,
   {
     mutt_buffer_printf(err, _("%s: command valid only for index, body, header objects"),
                        parse_uncolor ? "uncolor" : "unmono");
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
 
   if (!MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too few arguments"), parse_uncolor ? "uncolor" : "unmono");
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
 
   if (
@@ -1005,7 +1005,7 @@ static enum CommandResult parse_color(struct Buffer *buf, struct Buffer *s,
     if (!MoreArgs(s))
     {
       mutt_buffer_printf(err, _("%s: too few arguments"), color ? "color" : "mono");
-      return MUTT_CMD_ERROR;
+      return MUTT_CMD_WARNING;
     }
 
     mutt_extract_token(buf, s, 0);
@@ -1014,7 +1014,7 @@ static enum CommandResult parse_color(struct Buffer *buf, struct Buffer *s,
   if (MoreArgs(s) && (object != MT_COLOR_STATUS))
   {
     mutt_buffer_printf(err, _("%s: too many arguments"), color ? "color" : "mono");
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
 
   /* dry run? */
@@ -1070,7 +1070,7 @@ static enum CommandResult parse_color(struct Buffer *buf, struct Buffer *s,
     if (MoreArgs(s))
     {
       mutt_buffer_printf(err, _("%s: too many arguments"), color ? "color" : "mono");
-      return -1;
+      return MUTT_CMD_WARNING;
     }
 
     r = add_pattern(&ColorStatusList, buf->data, true, fg, bg, attr, err, false, match);

diff --git a/hook.c b/hook.c
index 402b712bb7b280da09cc6f720eb2acdb3393ff5d..ec09a195c0897578b60c233797aa59a685542c10 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -84,7 +84,7 @@ enum CommandResult mutt_parse_hook(struct Buffer *buf, struct Buffer *s,
   struct Hook *ptr = NULL;
   struct Buffer command, pattern;
   int rc;
-  bool not = false;
+  bool not = false, warning = false;
   regex_t *rx = NULL;
   struct Pattern *pat = NULL;
   char path[PATH_MAX];
@@ -106,7 +106,7 @@ enum CommandResult mutt_parse_hook(struct Buffer *buf, struct Buffer *s,
     if (!MoreArgs(s))
     {
       mutt_buffer_printf(err, _("%s: too few arguments"), buf->data);
-      goto error;
+      goto warn;
     }
   }
 
@@ -119,13 +119,13 @@ enum CommandResult mutt_parse_hook(struct Buffer *buf, struct Buffer *s,
   if (!command.data)
   {
     mutt_buffer_printf(err, _("%s: too few arguments"), buf->data);
-    goto error;
+    goto warn;
   }
 
   if (MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too many arguments"), buf->data);
-    goto error;
+    goto warn;
   }
 
   if (data & (MUTT_FOLDER_HOOK | MUTT_MBOX_HOOK))
@@ -275,11 +275,13 @@ enum CommandResult mutt_parse_hook(struct Buffer *buf, struct Buffer *s,
   TAILQ_INSERT_TAIL(&Hooks, ptr, entries);
   return MUTT_CMD_SUCCESS;
 
+warn:
+  warning = true;
 error:
   if (~data & MUTT_GLOBAL_HOOK) /* NOT a global hook */
     FREE(&pattern.data);
   FREE(&command.data);
-  return MUTT_CMD_ERROR;
+  return (warning ? MUTT_CMD_WARNING : MUTT_CMD_ERROR);
 }
 
 /**
@@ -334,7 +336,7 @@ enum CommandResult mutt_parse_unhook(struct Buffer *buf, struct Buffer *s,
       if (current_hook_type)
       {
         mutt_buffer_printf(err, "%s", _("unhook: Can't do unhook * from within a hook"));
-        return MUTT_CMD_ERROR;
+        return MUTT_CMD_WARNING;
       }
       mutt_delete_hooks(0);
       mutt_ch_lookup_remove();
@@ -357,7 +359,7 @@ enum CommandResult mutt_parse_unhook(struct Buffer *buf, struct Buffer *s,
       {
         mutt_buffer_printf(err, _("unhook: Can't delete a %s from within a %s"),
                            buf->data, buf->data);
-        return MUTT_CMD_ERROR;
+        return MUTT_CMD_WARNING;
       }
       mutt_delete_hooks(type);
     }

diff --git a/init.c b/init.c
index b55b97557691caf12e588736819613607f1daab7..5f96dd1d6c6785a5e3d38d7aa76434187080a9bc 100644 (file)
--- a/init.c
+++ b/init.c
@@ -581,7 +581,7 @@ static enum CommandResult parse_replace_list(struct Buffer *buf, struct Buffer *
   if (!MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too few arguments"), "subjectrx");
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
   mutt_extract_token(buf, s, 0);
 
@@ -589,7 +589,7 @@ static enum CommandResult parse_replace_list(struct Buffer *buf, struct Buffer *
   if (!MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too few arguments"), "subjectrx");
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
   mutt_extract_token(&templ, s, 0);
 
@@ -678,7 +678,7 @@ static enum CommandResult parse_unreplace_list(struct Buffer *buf, struct Buffer
   if (!MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too few arguments"), "unsubjectrx");
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
 
   mutt_extract_token(buf, s, 0);
@@ -897,7 +897,7 @@ static enum CommandResult parse_alias(struct Buffer *buf, struct Buffer *s,
   if (!MoreArgs(s))
   {
     mutt_buffer_strcpy(err, _("alias: no address"));
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
 
   mutt_extract_token(buf, s, 0);
@@ -1012,7 +1012,7 @@ static enum CommandResult parse_attachments(struct Buffer *buf, struct Buffer *s
   if (!buf->data || *buf->data == '\0')
   {
     mutt_buffer_strcpy(err, _("attachments: no disposition"));
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
 
   category = buf->data;
@@ -1068,7 +1068,7 @@ static enum CommandResult parse_echo(struct Buffer *buf, struct Buffer *s,
   if (!MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too few arguments"), "echo");
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
   mutt_extract_token(buf, s, 0);
   OptForceRefresh = true;
@@ -1082,7 +1082,7 @@ static enum CommandResult parse_echo(struct Buffer *buf, struct Buffer *s,
 /**
  * parse_finish - Parse the 'finish' command - Implements ::command_t
  * @retval  MUTT_CMD_FINISH Stop processing the current file
- * @retval  MUTT_CMD_ERROR Failed
+ * @retval  MUTT_CMD_WARNING Failed
  *
  * If the 'finish' command is found, we should stop reading the current file.
  */
@@ -1092,7 +1092,7 @@ static enum CommandResult parse_finish(struct Buffer *buf, struct Buffer *s,
   if (MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too many arguments"), "finish");
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
 
   return MUTT_CMD_FINISH;
@@ -1132,7 +1132,7 @@ static enum CommandResult parse_group(struct Buffer *buf, struct Buffer *s,
         case GS_NONE:
           mutt_buffer_printf(err, _("%sgroup: missing -rx or -addr"),
                              (data == MUTT_UNGROUP) ? "un" : "");
-          goto bail;
+          goto warn;
 
         case GS_RX:
           if (data == MUTT_GROUP &&
@@ -1175,6 +1175,10 @@ out:
 bail:
   mutt_grouplist_destroy(&gc);
   return MUTT_CMD_ERROR;
+
+warn:
+  mutt_grouplist_destroy(&gc);
+  return MUTT_CMD_WARNING;
 }
 
 /**
@@ -1249,7 +1253,7 @@ static enum CommandResult parse_ifdef(struct Buffer *buf, struct Buffer *s,
   if (!MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too few arguments"), (data ? "ifndef" : "ifdef"));
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
   mutt_extract_token(buf, s, MUTT_TOKEN_SPACE);
 
@@ -1331,7 +1335,7 @@ static enum CommandResult parse_my_hdr(struct Buffer *buf, struct Buffer *s,
   if (!p || (*p != ':'))
   {
     mutt_buffer_strcpy(err, _("invalid header field"));
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
   keylen = p - buf->data + 1;
 
@@ -1459,7 +1463,7 @@ static enum CommandResult parse_set(struct Buffer *buf, struct Buffer *s,
     {
       mutt_buffer_printf(err, "ERR22 cannot use 'inv', 'no', '&' or '?' with the '%s' command",
                          set_commands[data]);
-      return MUTT_CMD_ERROR;
+      return MUTT_CMD_WARNING;
     }
 
     /* get the variable name */
@@ -1503,14 +1507,14 @@ static enum CommandResult parse_set(struct Buffer *buf, struct Buffer *s,
       {
         mutt_buffer_printf(
             err, "ERR02 cannot use a prefix when querying a variable");
-        return MUTT_CMD_ERROR;
+        return MUTT_CMD_WARNING;
       }
 
       if (reset || unset || inv)
       {
         mutt_buffer_printf(err, "ERR03 cannot query a variable with the '%s' command",
                            set_commands[data]);
-        return MUTT_CMD_ERROR;
+        return MUTT_CMD_WARNING;
       }
 
       query = true;
@@ -1522,14 +1526,14 @@ static enum CommandResult parse_set(struct Buffer *buf, struct Buffer *s,
       {
         mutt_buffer_printf(err,
                            "ERR04 cannot use prefix when setting a variable");
-        return MUTT_CMD_ERROR;
+        return MUTT_CMD_WARNING;
       }
 
       if (reset || unset || inv)
       {
         mutt_buffer_printf(err, "ERR05 cannot set a variable with the '%s' command",
                            set_commands[data]);
-        return MUTT_CMD_ERROR;
+        return MUTT_CMD_WARNING;
       }
 
       equals = true;
@@ -1548,7 +1552,7 @@ static enum CommandResult parse_set(struct Buffer *buf, struct Buffer *s,
         mutt_buffer_printf(err, "ERR07 command '%s' can only be used with bool/quad variables",
                            set_commands[data]);
       }
-      return MUTT_CMD_ERROR;
+      return MUTT_CMD_WARNING;
     }
 
     if (reset)
@@ -1755,7 +1759,7 @@ static enum CommandResult parse_setenv(struct Buffer *buf, struct Buffer *s,
   if (!MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too few arguments"), "setenv");
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
 
   if (*s->dptr == '?')
@@ -1792,7 +1796,7 @@ static enum CommandResult parse_setenv(struct Buffer *buf, struct Buffer *s,
     }
 
     mutt_buffer_printf(err, _("%s is unset"), buf->data);
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
 
   if (unset)
@@ -1813,7 +1817,7 @@ static enum CommandResult parse_setenv(struct Buffer *buf, struct Buffer *s,
   if (!MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too few arguments"), "setenv");
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
 
   char *name = mutt_str_strdup(buf->data);
@@ -2017,7 +2021,7 @@ static enum CommandResult parse_subscribe_to(struct Buffer *buf, struct Buffer *
     if (MoreArgs(s))
     {
       mutt_buffer_printf(err, _("%s: too many arguments"), "subscribe-to");
-      return MUTT_CMD_ERROR;
+      return MUTT_CMD_WARNING;
     }
 
     if (buf->data && *buf->data)
@@ -2042,7 +2046,7 @@ static enum CommandResult parse_subscribe_to(struct Buffer *buf, struct Buffer *
   }
 
   mutt_buffer_addstr(err, _("No folder specified"));
-  return MUTT_CMD_ERROR;
+  return MUTT_CMD_WARNING;
 }
 #endif
 
@@ -2210,7 +2214,7 @@ static enum CommandResult parse_unattachments(struct Buffer *buf, struct Buffer
   if (!buf->data || *buf->data == '\0')
   {
     mutt_buffer_strcpy(err, _("unattachments: no disposition"));
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
 
   p = buf->data;
@@ -2401,7 +2405,7 @@ static enum CommandResult parse_unsubscribe_from(struct Buffer *buf, struct Buff
     if (MoreArgs(s))
     {
       mutt_buffer_printf(err, _("%s: too many arguments"), "unsubscribe-from");
-      return MUTT_CMD_ERROR;
+      return MUTT_CMD_WARNING;
     }
 
     if (buf->data && *buf->data)
@@ -2426,7 +2430,7 @@ static enum CommandResult parse_unsubscribe_from(struct Buffer *buf, struct Buff
   }
 
   mutt_buffer_addstr(err, _("No folder specified"));
-  return MUTT_CMD_ERROR;
+  return MUTT_CMD_WARNING;
 }
 #endif
 

diff --git a/mutt_lua.c b/mutt_lua.c
index fba9901683eb0c4440c2ad0345dd92587d19230f..f1e17cb05aca9ae7cbffaee88ea17a13b75a3f88 100644 (file)
--- a/mutt_lua.c
+++ b/mutt_lua.c
@@ -482,7 +482,7 @@ enum CommandResult mutt_lua_source_file(struct Buffer *buf, struct Buffer *s,
   if (MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too many arguments"), "source");
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
   mutt_str_strfcpy(path, buf->data, sizeof(path));
   mutt_expand_path(path, sizeof(path));

diff --git a/score.c b/score.c
index 217499bdcd0b84d847e9f95016e9109fd36d2354..81fa4fbcbe481e9c78eabc1e7a37797801bc82f3 100644 (file)
--- a/score.c
+++ b/score.c
@@ -106,7 +106,7 @@ enum CommandResult mutt_parse_score(struct Buffer *buf, struct Buffer *s,
   if (!MoreArgs(s))
   {
     mutt_buffer_printf(err, _("%s: too few arguments"), "score");
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
   pattern = buf->data;
   mutt_buffer_init(buf);
@@ -115,7 +115,7 @@ enum CommandResult mutt_parse_score(struct Buffer *buf, struct Buffer *s,
   {
     FREE(&pattern);
     mutt_buffer_printf(err, _("%s: too many arguments"), "score");
-    return MUTT_CMD_ERROR;
+    return MUTT_CMD_WARNING;
   }
 
   /* look for an existing entry and update the value, else add it to the end