mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-02 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

scanner: Make fail() function use va_list and elaborate a few errors

Browse source
This commit is contained in:
Kristian Høgsberg 2013-11-15 14:29:40 -08:00
parent db8ae8903f
commit 5a4dd76495
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/scanner.c
View file

@ -255,10 +255,16 @@ desc_dump(char *desc, const char *fmt, ...)
} }
static void static void
fail(struct location *loc, const char *msg) fail(struct location *loc, const char *msg, ...)
{ {
fprintf(stderr, "%s:%d: error: %s\n", va_list ap;
loc->filename, loc->line_number, msg);
va_start(ap, msg);
fprintf(stderr, "%s:%d: error: ",
loc->filename, loc->line_number);
vfprintf(stderr, msg, ap);
fprintf(stderr, "\n");
va_end(ap);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -378,7 +384,8 @@ start_element(void *data, const char *element_name, const char **atts)
if (since != NULL) { if (since != NULL) {
version = strtol(since, &end, 0); version = strtol(since, &end, 0);
if (errno == EINVAL || end == since || *end != '\0') if (errno == EINVAL || end == since || *end != '\0')
fail(&ctx->loc, "invalid integer\n"); fail(&ctx->loc,
"invalid integer (%s)\n", since);
if (version < ctx->interface->since) if (version < ctx->interface->since)
fail(&ctx->loc, "since version not increasing\n"); fail(&ctx->loc, "since version not increasing\n");
ctx->interface->since = version; ctx->interface->since = version;
@ -414,7 +421,7 @@ start_element(void *data, const char *element_name, const char **atts)
} else if (strcmp(type, "object") == 0) { } else if (strcmp(type, "object") == 0) {
arg->type = OBJECT; arg->type = OBJECT;
} else { } else {
fail(&ctx->loc, "unknown type"); fail(&ctx->loc, "unknown type (%s)", type);
} }
switch (arg->type) { switch (arg->type) {
@ -431,7 +438,7 @@ start_element(void *data, const char *element_name, const char **atts)
break; break;
default: default:
if (interface_name != NULL) if (interface_name != NULL)
fail(&ctx->loc, "interface not allowed"); fail(&ctx->loc, "interface attribute not allowed for type %s", type);
break; break;
} }
@ -440,7 +447,7 @@ start_element(void *data, const char *element_name, const char **atts)
else if (strcmp(allow_null, "true") == 0) else if (strcmp(allow_null, "true") == 0)
arg->nullable = 1; arg->nullable = 1;
else else
fail(&ctx->loc, "invalid value for allow-null attribute"); fail(&ctx->loc, "invalid value for allow-null attribute (%s)", allow_null);
if (allow_null != NULL && !is_nullable_type(arg)) if (allow_null != NULL && !is_nullable_type(arg))
fail(&ctx->loc, "allow-null is only valid for objects, strings, and arrays"); fail(&ctx->loc, "allow-null is only valid for objects, strings, and arrays");