kernel
/
dtc
mirror of https://git.kernel.org/pub/scm/utils/dtc/dtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make srcpos_{v,}error() more widely useful 

Allow them to take a prefix argument giving the general type of error,
which will be useful in future.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
main
David Gibson 2014-01-01 23:27:31 +11:00
parent 0c0bf8519a
commit 0e2d399225
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtc-parser.y
View File

@ -475,7 +475,7 @@ void print_error(char const *fmt, ...)
va_list va; va_list va;


va_start(va, fmt); va_start(va, fmt);
srcpos_verror(&yylloc, fmt, va); srcpos_verror(&yylloc, "Error", fmt, va);
va_end(va); va_end(va);


treesource_error = true; treesource_error = true;

12
srcpos.c
View File

@ -290,27 +290,27 @@ srcpos_string(struct srcpos *pos)
return pos_str; return pos_str;
} }


void void srcpos_verror(struct srcpos *pos, const char *prefix,
srcpos_verror(struct srcpos *pos, const char *fmt, va_list va) const char *fmt, va_list va)
{ {
char *srcstr; char *srcstr;


srcstr = srcpos_string(pos); srcstr = srcpos_string(pos);


fprintf(stderr, "Error: %s ", srcstr); fprintf(stderr, "%s: %s ", prefix, srcstr);
vfprintf(stderr, fmt, va); vfprintf(stderr, fmt, va);
fprintf(stderr, "\n"); fprintf(stderr, "\n");


free(srcstr); free(srcstr);
} }


void void srcpos_error(struct srcpos *pos, const char *prefix,
srcpos_error(struct srcpos *pos, const char *fmt, ...) const char *fmt, ...)
{ {
va_list va; va_list va;


va_start(va, fmt); va_start(va, fmt);
srcpos_verror(pos, fmt, va); srcpos_verror(pos, prefix, fmt, va);
va_end(va); va_end(va);
} }



10
srcpos.h
View File

@ -107,10 +107,12 @@ extern struct srcpos *srcpos_copy(struct srcpos *pos);
extern char *srcpos_string(struct srcpos *pos); extern char *srcpos_string(struct srcpos *pos);
extern void srcpos_dump(struct srcpos *pos); extern void srcpos_dump(struct srcpos *pos);


extern void srcpos_verror(struct srcpos *pos, const char *, va_list va) extern void srcpos_verror(struct srcpos *pos, const char *prefix,
__attribute__((format(printf, 2, 0))); const char *fmt, va_list va)
extern void srcpos_error(struct srcpos *pos, const char *, ...) __attribute__((format(printf, 3, 0)));
__attribute__((format(printf, 2, 3))); extern void srcpos_error(struct srcpos *pos, const char *prefix,
const char *fmt, ...)
__attribute__((format(printf, 3, 4)));


extern void srcpos_set_line(char *f, int l); extern void srcpos_set_line(char *f, int l);