Print scalar initialisers as assignment expressions instead of plain expressions...

[cparser] / format_check.c

diff --git a/format_check.c b/format_check.c
index ea3359b..5990248 100644 (file)
--- a/format_check.c
+++ b/format_check.c
@@ -517,7 +517,7 @@ eval_fmt_mod_unsigned:
                                break;
 
                        default:
-                               warningf(pos, "encountered unknown conversion specifier '%%%c' at position %u", (char) fmt, num_fmt);
+                               warningf(pos, "encountered unknown conversion specifier '%%%C' at position %u", (wint_t)fmt, num_fmt);
                                if (arg == NULL) {
                                        warningf(pos, "too few arguments for format string");
                                        return;
@@ -580,7 +580,7 @@ next_arg:
                arg = arg->next;
        }
        if (!atend(&vchar)) {
-               warningf(pos, "format string contains '\0'");
+               warningf(pos, "format string contains '\\0'");
        }
        if (arg != NULL) {
                unsigned num_args = num_fmt;
@@ -852,7 +852,7 @@ eval_fmt_mod_unsigned:
                                break;
 
                        default:
-                               warningf(pos, "encountered unknown conversion specifier '%%%c' at position %u", (char) fmt, num_fmt);
+                               warningf(pos, "encountered unknown conversion specifier '%%%C' at position %u", (wint_t)fmt, num_fmt);
                                if (arg == NULL) {
                                        warningf(pos, "too few arguments for format string");
                                        return;
@@ -902,7 +902,7 @@ next_arg:
                arg = arg->next;
        }
        if (!atend(&vchar)) {
-               warningf(pos, "format string contains NUL");
+               warningf(pos, "format string contains '\\0'");
        }
        if (arg != NULL) {
                unsigned num_args = num_fmt;
@@ -910,7 +910,7 @@ next_arg:
                        ++num_args;
                        arg = arg->next;
                }
-               warningf(pos, "%u argument%s but only %u format string%s",
+               warningf(pos, "%u argument%s but only %u format specifier%s",
                        num_args, num_args != 1 ? "s" : "",
                        num_fmt, num_fmt != 1 ? "s" : "");
        }