Skip to content

[static analysis] close config file when no longer needed #37

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

Merged
dmuhamedagic merged 2 commits into from
May 19, 2016
Merged

[static analysis] close config file when no longer needed #37

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f436cba
Low: read_config: unify jump labels (parsing: err, after: out)
jnpkrn May 12, 2016
29806a1
Low: read_config: close config file when no longer needed
jnpkrn May 12, 2016
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
Next Next commit
Low: read_config: unify jump labels (parsing: err, after: out) 
This is a preparation work for a subsequent commit
"Low: read_config: close config file when no longer needed".
  • Loading branch information
@jnpkrn
jnpkrn committed May 12, 2016
commit f436cba56ca0ec6119f31aa9fb3a2e1880092a6e
12 changes: 6 additions & 6 deletions src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,13 +655,13 @@ int read_config(const char *path, int type)

if (strcmp(key, "site") == 0) {
if (add_site(val, SITE))
goto out;
goto err;
continue;
}

if (strcmp(key, "arbitrator") == 0) {
if (add_site(val, ARBITRATOR))
goto out;
goto err;
continue;
}

Expand Down Expand Up @@ -695,13 +695,13 @@ int read_config(const char *path, int type)
if (strcmp(key, "ticket") == 0) {
if (current_tk && strcmp(current_tk->name, "__defaults__")) {
if (!postproc_ticket(current_tk)) {
goto out;
goto err;
}
}
if (!strcmp(val, "__defaults__")) {
current_tk = &defaults;
} else if (add_ticket(val, &current_tk, &defaults)) {
goto out;
goto err;
}
continue;
}
Expand Down Expand Up @@ -781,7 +781,7 @@ int read_config(const char *path, int type)

if (strcmp(key, "weights") == 0) {
if (parse_weights(val, current_tk->weight) < 0)
goto out;
goto err;
continue;
}

Expand All @@ -802,7 +802,7 @@ int read_config(const char *path, int type)
cp2 = cp + strlen(cp);
if (cp2-cp >= BOOTH_NAME_LEN) {
log_error("booth config file name too long");
goto err;
goto out;
}
strncpy(booth_conf->name, cp, cp2-cp);
*(booth_conf->name+(cp2-cp)) = '\0';
Expand Down