summaryrefslogtreecommitdiff
path: root/kicad
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-08-22 05:04:23 -0300
committerWerner Almesberger <werner@almesberger.net>2016-08-22 05:04:23 -0300
commitf4c830911621fca111a28ffc735a11b330975adf (patch)
treeafa7e743ddf393c0a1e2318a2710418e7b92e406 /kicad
parent4f05f33f81bcd58863e941514c291baabd89f2a9 (diff)
downloadeeshow-f4c830911621fca111a28ffc735a11b330975adf.tar.gz
eeshow-f4c830911621fca111a28ffc735a11b330975adf.tar.bz2
eeshow-f4c830911621fca111a28ffc735a11b330975adf.zip
eeshow/diag.c (error): don't require user to supply newline
Diffstat (limited to 'kicad')
-rw-r--r--kicad/lib-render.c2
-rw-r--r--kicad/pl-parse.c20
-rw-r--r--kicad/sexpr.c10
3 files changed, 16 insertions, 16 deletions
diff --git a/kicad/lib-render.c b/kicad/lib-render.c
index 56773a2..c547cb7 100644
--- a/kicad/lib-render.c
+++ b/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/kicad/pl-parse.c b/kicad/pl-parse.c
index 4931ec2..bd8f326 100644
--- a/kicad/pl-parse.c
+++ b/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/kicad/sexpr.c b/kicad/sexpr.c
index baf08ed..0727891 100644
--- a/kicad/sexpr.c
+++ b/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;