From 1a5c8a564c5ae9511bc53221bf8178e961883d96 Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Mon, 22 Aug 2016 05:04:23 -0300 Subject: [PATCH] eeshow/diag.c (error): don't require user to supply newline --- eeshow/file/file.c | 2 +- eeshow/file/git-file.c | 4 ++-- eeshow/kicad/lib-render.c | 2 +- eeshow/kicad/pl-parse.c | 20 ++++++++++---------- eeshow/kicad/sexpr.c | 10 +++++----- eeshow/misc/diag.c | 1 + 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/eeshow/file/file.c b/eeshow/file/file.c index 6d84ed8..d41d053 100644 --- a/eeshow/file/file.c +++ b/eeshow/file/file.c @@ -194,7 +194,7 @@ bool file_open(struct file *file, const char *name, const struct file *related) if (file->vcs) return 1; - error("could not open %s\n", name); + error("could not open %s", name); fail: free((char *) file->name); return 0; diff --git a/eeshow/file/git-file.c b/eeshow/file/git-file.c index 7c9cf78..681556b 100644 --- a/eeshow/file/git-file.c +++ b/eeshow/file/git-file.c @@ -286,7 +286,7 @@ static git_tree_entry *find_file(git_repository *repo, git_tree *tree, if (git_tree_entry_bypath(&entry, tree, canon_path)) { const git_error *e = giterr_last(); - error("%s: %s\n", path, e->message); + error("%s: %s", path, e->message); free(canon_path); return NULL; } @@ -443,7 +443,7 @@ struct vcs_git *vcs_git_open(const char *revision, const char *name, vcs_git->repo = select_repo(name); if (!vcs_git->repo) { - error("%s: not found\n", name); + error("%s: not found", name); goto fail; } progress(2, "using repository %s\n", diff --git a/eeshow/kicad/lib-render.c b/eeshow/kicad/lib-render.c index 56773a2..c547cb7 100644 --- a/eeshow/kicad/lib-render.c +++ b/eeshow/kicad/lib-render.c @@ -398,7 +398,7 @@ const struct comp *lib_find(const struct lib *lib, const char *name) if (!strcmp(alias->name, name)) return comp; } - error("\"%s\" not found\n", name); + error("\"%s\" not found", name); return NULL; } diff --git a/eeshow/kicad/pl-parse.c b/eeshow/kicad/pl-parse.c index 4931ec2..bd8f326 100644 --- a/eeshow/kicad/pl-parse.c +++ b/eeshow/kicad/pl-parse.c @@ -49,7 +49,7 @@ static bool get_coord(const struct expr *e, float f = strtof(e->s, &end); if (*end) { - error("no a number \"%s\"\n", e->s); + error("no a number \"%s\"", e->s); return 0; } if (n++) @@ -62,12 +62,12 @@ static bool get_coord(const struct expr *e, switch (n) { case 0: case 1: - error("no enough coordinates\n"); + error("no enough coordinates"); return 0; case 2: return 1; default: - error("too many coordinates\n"); + error("too many coordinates"); return 0; } } @@ -86,7 +86,7 @@ static bool get_size(const struct expr *e, float *x, float *y) f = strtof(e->s, &end); if (*end) { - error("no a number \"%s\"\n", e->s); + error("no a number \"%s\"", e->s); return 0; } if (n++) @@ -98,12 +98,12 @@ static bool get_size(const struct expr *e, float *x, float *y) switch (n) { case 0: case 1: - error("no enough coordinates\n"); + error("no enough coordinates"); return 0; case 2: return 1; default: - error("too many coordinates\n"); + error("too many coordinates"); return 0; } } @@ -116,7 +116,7 @@ static bool get_float(const struct expr *e, float *f) *f = atof(e->s); // @@@ error checking return 1; } - error("no number found\n"); + error("no number found"); return 0; } @@ -129,7 +129,7 @@ static bool get_int(const struct expr *e, int *n) *n = atoi(e->s); // @@@ error checking return 1; } - error("no number found\n"); + error("no number foundn"); return 0; } @@ -263,7 +263,7 @@ static bool process_obj(struct pl_ctx *pl, const struct expr *e, for (; e; e = e->next) { if (e->s) { if (obj->s) { - error("multiple strings\n"); + error("multiple strings"); return 0; } obj->s = stralloc(e->s); @@ -365,7 +365,7 @@ static bool process(struct pl_ctx *p, const struct expr *e) return process_layout(p, e->e->next); e = e->next; } - error("no layout information found\n"); + error("no layout information found"); return 0; } diff --git a/eeshow/kicad/sexpr.c b/eeshow/kicad/sexpr.c index baf08ed..0727891 100644 --- a/eeshow/kicad/sexpr.c +++ b/eeshow/kicad/sexpr.c @@ -138,7 +138,7 @@ bool sexpr_parse(struct sexpr_ctx *ctx, const char *s) case ')': if (!ctx->sp->prev) { ctx->state = failed; - error("too many\n )"); + error("too many )"); break; } ctx->sp = ctx->sp->prev; @@ -177,7 +177,7 @@ bool sexpr_parse(struct sexpr_ctx *ctx, const char *s) case '\r': case '\n': ctx->state = failed; - error("newline in string\n"); + error("newline in string"); break; case '"': ctx->state = idle; @@ -195,7 +195,7 @@ bool sexpr_parse(struct sexpr_ctx *ctx, const char *s) case '\r': case '\n': ctx->state = failed; - error("newline in string\n"); + error("newline in string"); break; default: ctx->state = string; @@ -323,11 +323,11 @@ void sexpr_abort(struct sexpr_ctx *ctx) bool sexpr_finish(struct sexpr_ctx *ctx, struct expr **res) { if (ctx->sp != &ctx->stack) { - error("not enough )\n"); + error("not enough )"); ctx->state = failed; } if (ctx->state != idle && ctx->state != failed) - error("invalid end state %d\n", ctx->state); + error("invalid end state %d", ctx->state); if (ctx->state != idle) { sexpr_abort(ctx); return 0; diff --git a/eeshow/misc/diag.c b/eeshow/misc/diag.c index 3fc1ad8..5c39896 100644 --- a/eeshow/misc/diag.c +++ b/eeshow/misc/diag.c @@ -59,6 +59,7 @@ void error(const char *fmt, ...) va_start(ap, fmt); vfprintf(stderr, fmt, ap); va_end(ap); + fprintf(stderr, "\n"); }