X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=format_check.c;h=5d7f0a1dad7a8abde5277fe7d285427977c24aed;hb=442cc935f91c445283176287cd3c6fe536416bf7;hp=aedea185d46aa1711fb81f641aa14e896e3ff97d;hpb=2b6577c3a49012912b312c437d1671a9d7c3ac5a;p=cparser

diff --git a/format_check.c b/format_check.c
index aedea18..5d7f0a1 100644
--- a/format_check.c
+++ b/format_check.c
@@ -20,6 +20,7 @@
 #include <ctype.h>
 #include <wctype.h>
 
+#include "adt/util.h"
 #include "format_check.h"
 #include "symbol_t.h"
 #include "ast_t.h"
@@ -86,7 +87,7 @@ static const char* get_length_modifier_name(const format_length_modifier_t mod)
 		[FMT_MOD_I32]  = "I32",
 		[FMT_MOD_I64]  = "I64"
 	};
-	assert(mod < sizeof(names) / sizeof(*names));
+	assert(mod < lengthof(names));
 	return names[mod];
 }
 
@@ -114,39 +115,46 @@ struct vchar_t {
 	int (*is_digit)(unsigned vchar);
 };
 
-static unsigned string_first(vchar_t *self) {
+static unsigned string_first(vchar_t *self)
+{
 	self->position = 0;
 	const string_t *string = self->string;
 	return string->begin[0];
 }
 
-static unsigned string_next(vchar_t *self) {
+static unsigned string_next(vchar_t *self)
+{
 	++self->position;
 	const string_t *string = self->string;
 	return string->begin[self->position];
 }
 
-static int string_isdigit(unsigned vchar) {
+static int string_isdigit(unsigned vchar)
+{
 	return isdigit(vchar);
 }
 
-static unsigned wstring_first(vchar_t *self) {
+static unsigned wstring_first(vchar_t *self)
+{
 	self->position = 0;
 	const wide_string_t *wstring = self->string;
 	return wstring->begin[0];
 }
 
-static unsigned wstring_next(vchar_t *self) {
+static unsigned wstring_next(vchar_t *self)
+{
 	++self->position;
 	const wide_string_t *wstring = self->string;
 	return wstring->begin[self->position];
 }
 
-static int wstring_isdigit(unsigned vchar) {
+static int wstring_isdigit(unsigned vchar)
+{
 	return iswdigit(vchar);
 }
 
-static bool atend(vchar_t *self) {
+static bool atend(vchar_t *self)
+{
 	return self->position + 1 == self->size;
 }
 
@@ -580,7 +588,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;
@@ -902,7 +910,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 +918,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" : "");
 	}
@@ -985,7 +993,7 @@ void check_format(const call_expression_t *const call)
 		 * This allows to check format even in MS mode or without header included.
 		 */
 		const char *const name = entity->base.symbol->string;
-		for (size_t i = 0; i < sizeof(builtin_table) / sizeof(builtin_table[0]); ++i) {
+		for (size_t i = 0; i < lengthof(builtin_table); ++i) {
 			if (strcmp(name, builtin_table[i].name) == 0) {
 				switch (builtin_table[i].fmt_kind) {
 				case FORMAT_PRINTF: