[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 22/48: [troff]: Rename `WARN_TOTAL` symbol to `WARN_MAX`.
From: |
G. Branden Robinson |
Subject: |
[groff] 22/48: [troff]: Rename `WARN_TOTAL` symbol to `WARN_MAX`. |
Date: |
Thu, 15 Aug 2024 13:15:34 -0400 (EDT) |
gbranden pushed a commit to branch master
in repository groff.
commit f0a495539dd986b4b0beb42994057ec4bc9aadef
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Aug 13 05:58:36 2024 -0500
[troff]: Rename `WARN_TOTAL` symbol to `WARN_MAX`.
...for consistency with other GNU troff enumerated types.
* src/roff/troff/troff.h:
* src/roff/troff/input.cpp: Do it.
* src/roff/troff/input.cpp (warn_request): Clarify warning diagnostic.
---
ChangeLog | 11 +++++++++++
src/roff/troff/input.cpp | 13 +++++++------
src/roff/troff/troff.h | 4 ++--
3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 142d182c1..772285396 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-08-13 G. Branden Robinson <g.branden.robinson@gmail.com>
+
+ [troff]: Rename `WARN_TOTAL` symbol to `WARN_MAX` for
+ consistency with other GNU troff enumerated types.
+
+ * src/roff/troff/troff.h:
+ * src/roff/troff/input.cpp: Do it.
+
+ * src/roff/troff/input.cpp (warn_request): Clarify warning
+ diagnostic.
+
2024-08-13 G. Branden Robinson <g.branden.robinson@gmail.com>
* src/roff/troff/div.cpp
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index ac9fbcd14..a30c4c844 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -8547,14 +8547,15 @@ void warn_request()
{
int n;
if (has_arg() && get_integer(&n)) {
- if (n & ~WARN_TOTAL) {
- warning(WARN_RANGE, "warning mask must be between 0 and %1", WARN_TOTAL);
- n &= WARN_TOTAL;
+ if (n & ~WARN_MAX) {
+ warning(WARN_RANGE, "warning mask must be in range 0..%1",
+ WARN_MAX);
+ n &= WARN_MAX;
}
warning_mask = n;
}
else
- warning_mask = WARN_TOTAL;
+ warning_mask = WARN_MAX;
skip_line();
}
@@ -9003,8 +9004,8 @@ static struct {
{ "ig", WARN_IG },
{ "color", WARN_COLOR },
{ "file", WARN_FILE },
- { "all", WARN_TOTAL & ~(WARN_DI | WARN_MAC | WARN_REG) },
- { "w", WARN_TOTAL },
+ { "all", WARN_MAX & ~(WARN_DI | WARN_MAC | WARN_REG) },
+ { "w", WARN_MAX },
{ "default", DEFAULT_WARNING_MASK },
};
diff --git a/src/roff/troff/troff.h b/src/roff/troff/troff.h
index 337adf4b7..494068d14 100644
--- a/src/roff/troff/troff.h
+++ b/src/roff/troff/troff.h
@@ -68,10 +68,10 @@ enum warning_type {
WARN_IG = 01000000,
WARN_COLOR = 02000000,
WARN_FILE = 04000000
- // change WARN_TOTAL if you add more warning types
+ // change WARN_MAX if you add more warning types
};
-const int WARN_TOTAL = 07777777;
+const int WARN_MAX = 07777777;
int warning(warning_type, const char *,
const errarg & = empty_errarg,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 22/48: [troff]: Rename `WARN_TOTAL` symbol to `WARN_MAX`.,
G. Branden Robinson <=