Skip to content

Fix extra comma in compiledb #524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jp-embedded wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix extra comma in compiledb #524

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/tup/db.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7492,15 +7492,9 @@ static void print_json(FILE *f, const char *str, int len)

static int print_compile_db(FILE *f, struct tup_entry *cmdtent, struct tup_entry *filetent)
{
static int first_time = 1;
struct tup_entry *srctent = variant_tent_to_srctent(cmdtent->parent);
struct estring e;

if(first_time) {
first_time = 0;
} else {
fprintf(f, ",\n");
}
fprintf(f, "{\n");
fprintf(f, " \"directory\": \"");
estring_init(&e);
Expand Down Expand Up @@ -7554,12 +7548,15 @@ int tup_db_create_compile_db(FILE *f, struct variant *variant)
RB_FOREACH(stt, tent_entries, &stickies) {
if(stt->tent->type == TUP_NODE_FILE ||
stt->tent->type == TUP_NODE_GENERATED) {
if (!empty) {
fprintf(f, ",\n");
}
print_compile_db(f, cmdtent, stt->tent);
empty = 0;
}
}
free_tent_tree(&stickies);

empty = 0;
}
fprintf(f, "\n]\n");
if(tup_db_commit() < 0)
Expand Down