summaryrefslogtreecommitdiff
path: root/src/xkbcomp/compat.c
diff options
context:
space:
mode:
authorPierre Le Marre <dev@wismill.eu>2023-09-18 18:17:34 +0200
committerWismill <dev@wismill.eu>2023-09-19 08:49:52 +0200
commitef81d04eef4b1a60ff42bd9ccbe2918b0a5420ec (patch)
tree58bb8120a870c6f3db1f50d2049c0f69f2030d80 /src/xkbcomp/compat.c
parent0e3e2d17302e99e68bdab3b5db0a1dcc835e5bee (diff)
downloadlibxkbcommon-ef81d04eef4b1a60ff42bd9ccbe2918b0a5420ec.tar.gz
libxkbcommon-ef81d04eef4b1a60ff42bd9ccbe2918b0a5420ec.tar.bz2
libxkbcommon-ef81d04eef4b1a60ff42bd9ccbe2918b0a5420ec.zip
Structured log messages with a message registry
Currently there is little structure in the log messages, making difficult to use them for the following use cases: - A user looking for help about a log message: the user probably uses a search engine, thus the results will depend on the proper indexing of our documentation and the various forums. It relies only on the wording of the message, which may change with time. - A user wants to filter the logs resulting of the use of one of the components of xkbcommon. A typical example would be testing xkeyboard-config against libxkbcommon. It requires the use of a pattern (simple words detection or regex). The issue is that the pattern may become silently out-of-sync with xkbcommon. A common practice (e.g. in compilers) is to assign unique error codes to reference theses messages, along with an error index for documentation. Thus this commit implements the following features: - Create a message registry (message-registry.yaml) that defines the log messages produced by xkbcommon. This is a simple YAML file that provides, for each message: - A unique numeric code as a short identifier. It is used in the output message and thus can be easily be filtered to spot errors or searched in the internet. It must not change: if the semantics of message changes, it is better to introduce a new message for clarity. - A unique text identifier, meant for two uses: 1. Generate constants dealing with log information in our code base. 2. Generate human-friendly names for the documentation. - A type: currently warning or error. Used to prefix the constants (see hereinabove) and for basic classification in documentation. - A short description, used as concise and mandatory documentation. - An optionnal detailed description. - Optional examples, intended to help the user to fix issues themself. - Version of xkbcommon it was added. For old entries this often unknown, so they will default to 1.0.0. - Version of xkbcommon it was removed (optional) No entry should ever be deleted from this index, even if the message is not used anymore: it ensures we have unique identifiers along the history of xkbcommon, and that users can refer to the documentation even for older versions. - Add the script update-message-registry.py to generate the following files: - messages.h: message code enumeration for the messages currently used in the code base. Currently a private API. - message.registry.md: the error index documentation page. - Modify the logging functions to use structured messages. This is a work in progress.
Diffstat (limited to 'src/xkbcomp/compat.c')
-rw-r--r--src/xkbcomp/compat.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index b8922c9..121f5f2 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -124,7 +124,8 @@ static inline bool
ReportSIBadType(CompatInfo *info, SymInterpInfo *si, const char *field,
const char *wanted)
{
- return ReportBadType(info->ctx, "symbol interpretation", field,
+ return ReportBadType(info->ctx, XKB_ERROR_WRONG_FIELD_TYPE,
+ "symbol interpretation", field,
siText(si, info), wanted);
}
@@ -132,7 +133,8 @@ static inline bool
ReportLedBadType(CompatInfo *info, LedInfo *ledi, const char *field,
const char *wanted)
{
- return ReportBadType(info->ctx, "indicator map", field,
+ return ReportBadType(info->ctx, XKB_ERROR_WRONG_FIELD_TYPE,
+ "indicator map", field,
xkb_atom_text(info->ctx, ledi->led.name),
wanted);
}