m->compiled = build_module(m, keep, &errstr);
if (!m->compiled) {
- score_file_error(score, NULL, 0, errstr);
+ score_file_error(score, NULL, 0, "%s", errstr);
return;
}
linenum++,
expect = find_expect(i, lines, &input,
&exact, &linenum)) {
- char *err;
if (i->compiled == NULL)
continue;
score->score++;
continue;
}
- err = talloc_asprintf(score,
- "output '%s' didn't"
- " %s '%s'\n",
- output,
- exact
- ? "match" : "contain",
- expect);
- score_file_error(score, i, linenum+1, err);
+ score_file_error(score, i, linenum+1,
+ "output '%s' didn't %s '%s'\n",
+ output,
+ exact ? "match" : "contain",
+ expect);
score->pass = false;
}
}
if (!get_token(&line, "#"))
abort();
if (!get_token(&line, "define")) {
- char *str = talloc_asprintf(score,
- "expected '#define %s'",
- line_info[i].cond->symbol);
- score_file_error(score, f, i+1, str);
+ score_file_error(score, f, i+1,
+ "expected '#define %s'",
+ line_info[i].cond->symbol);
return;
}
sym = get_symbol_token(f, &line);
if (!sym || !streq(sym, line_info[i].cond->symbol)) {
- char *str = talloc_asprintf(score,
- "expected '#define %s'",
- line_info[i].cond->symbol);
- score_file_error(score, f, i+1, str);
+ score_file_error(score, f, i+1,
+ "expected '#define %s'",
+ line_info[i].cond->symbol);
return;
}
score->pass = false;
score->score = 0;
score_file_error(score, m->info_file, d->srcline+1,
- m->info_file->lines[d->srcline]);
- score_file_error(score, m->info_file, d->srcline+2,
+ "%s\n%s",
+ m->info_file->lines[d->srcline],
m->info_file->lines[d->srcline+1]);
}
}
for (i = 0; i < f->num_lines; i++) {
char *err = get_trailing_whitespace(lines[i]);
if (err)
- score_file_error(score, f, i+1, err);
+ score_file_error(score, f, i+1,
+ "%s", err);
}
}
}
i->cov_compiled = maybe_temp_file(m, "", keep, fullfile);
if (!compile_object(m, fullfile, ccan_dir, "",
i->cov_compiled, &err)) {
- score_file_error(score, i, 0, err);
+ score_file_error(score, i, 0, "%s", err);
talloc_free(i->cov_compiled);
i->cov_compiled = NULL;
return false;
i->leak_info = get_leaks(output, &err);
}
if (err)
- score_file_error(score, i, 0, err);
+ score_file_error(score, i, 0, "%s", err);
else
score->score++;
}
foreach_ptr(list, &m->run_tests, &m->api_tests) {
list_for_each(list, i, list) {
if (i->leak_info) {
- score_file_error(score, i, 0, i->leak_info);
+ score_file_error(score, i, 0, "%s",
+ i->leak_info);
leaks = true;
}
}