warnings errors_flag;
-bool complaint_issued;
+err_status complaint_status = status_none;
static unsigned *indent_ptr = 0;
void
/** Raise a complaint. That can be a fatal error, a complaint or just a
warning. */
-
static inline void
complains (const location *loc, warnings flags, const char *message,
va_list args)
-
{
const char* prefix =
flags & fatal ? _("fatal error")
: flags & (errors_flag | complaint) ? _("error")
: _("warning");
- complaint_issued |= flags & (complaint | errors_flag);
- if (flags & (warnings_flag | silent | fatal | complaint))
+ if ((flags & complaint) && complaint_status < status_complaint)
+ complaint_status = status_complaint;
+ else if ((flags & (warnings_flag & errors_flag)) && ! complaint_status)
+ complaint_status = status_warning_as_error;
+ if (flags & (warnings_flag | fatal | complaint))
error_message (loc, flags, prefix, message, args);
if (flags & fatal)
exit (EXIT_FAILURE);
}
void
-complain_args (location const *loc, warnings w, int argc, char *argv[])
+complain_args (location const *loc, warnings w, unsigned *indent,
+ int argc, char *argv[])
{
switch (argc)
{
+ case 1:
+ complain_indent (loc, w, indent, "%s", _(argv[0]));
+ break;
case 2:
- complain (loc, w, "%s", _(argv[1]));
+ complain_indent (loc, w, indent, _(argv[0]), argv[1]);
break;
case 3:
- complain (loc, w, _(argv[1]), argv[2]);
+ complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2]);
break;
case 4:
- complain (loc, w, _(argv[1]), argv[2], argv[3]);
+ complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2], argv[3]);
break;
case 5:
- complain (loc, w, _(argv[1]), argv[2], argv[3], argv[4]);
- break;
- case 6:
- complain (loc, w, _(argv[1]), argv[2], argv[3], argv[4], argv[5]);
+ complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2], argv[3],
+ argv[4]);
break;
default:
complain (loc, fatal, "too many arguments for complains");