Messages: merge macros with and without message code

[platform/upstream/libxkbcommon.git] / src / xkbcomp / xkbcomp-priv.h

diff --git a/src/xkbcomp/xkbcomp-priv.h b/src/xkbcomp/xkbcomp-priv.h
index 50c07b5..3de8d8d 100644 (file)
--- a/src/xkbcomp/xkbcomp-priv.h
+++ b/src/xkbcomp/xkbcomp-priv.h
@@ -82,7 +82,7 @@ static inline bool
 ReportNotArray(struct xkb_context *ctx, const char *type, const char *field,
                const char *name)
 {
-    log_err_with_code(ctx,
+    log_err(ctx,
             XKB_ERROR_WRONG_FIELD_TYPE,
             "The %s %s field is not an array; "
             "Ignoring illegal assignment in %s\n",
@@ -94,7 +94,7 @@ static inline bool
 ReportShouldBeArray(struct xkb_context *ctx, const char *type,
                     const char *field, const char *name)
 {
-    log_err_with_code(ctx,
+    log_err(ctx,
             XKB_ERROR_EXPECTED_ARRAY_ENTRY,
             "Missing subscript for %s %s; "
             "Ignoring illegal assignment in %s\n",
@@ -106,7 +106,8 @@ static inline bool
 ReportBadType(struct xkb_context *ctx, xkb_message_code_t code, const char *type,
               const char *field, const char *name, const char *wanted)
 {
-    log_err_with_code(ctx, code, "The %s %s field must be a %s; "
+    log_err(ctx, code,
+            "The %s %s field must be a %s; "
             "Ignoring illegal assignment in %s\n",
             type, field, wanted, name);
     return false;
@@ -116,7 +117,7 @@ static inline bool
 ReportBadField(struct xkb_context *ctx, const char *type, const char *field,
                const char *name)
 {
-    log_err(ctx,
+    log_err(ctx, XKB_LOG_MESSAGE_NO_ID,
             "Unknown %s field %s in %s; "
             "Ignoring assignment to unknown field in %s\n",
             type, field, name, name);