shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-28 20:25:25 +03:00
Code

qutoacheck,gpt-auto-generator: trivial coding style improvements

Browse Source
This commit is contained in:
Lennart Poettering 2016-12-12 18:43:38 +01:00
parent 1d84ad9445
commit 57ab9f8930
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gpt-auto-generator/gpt-auto-generator.c
View File

@ -986,11 +986,11 @@ static int add_mounts(void) {
r = get_block_device_harder("/", &devno);
if (r < 0)
return log_error_errno(r, "Failed to determine block device of root file system: %m");
else if (r == 0) {
if (r == 0) {
r = get_block_device_harder("/usr", &devno);
if (r < 0)
return log_error_errno(r, "Failed to determine block device of /usr file system: %m");
else if (r == 0) {
if (r == 0) {
log_debug("Neither root nor /usr file system are on a (single) block device.");
return 0;
}
@ -1000,7 +1000,7 @@ static int add_mounts(void) {
}
int main(int argc, char *argv[]) {
int r = 0;
int r = 0, k;
if (argc > 1 && argc != 4) {
log_error("This program takes three or no arguments.");
@ -1034,8 +1034,6 @@ int main(int argc, char *argv[]) {
r = add_root_mount();
if (!in_initrd()) {
int k;
k = add_mounts();
if (k < 0)
r = k;

8
src/quotacheck/quotacheck.c
View File

@ -107,9 +107,10 @@ int main(int argc, char *argv[]) {
pid = fork();
if (pid < 0) {
log_error_errno(errno, "fork(): %m");
return EXIT_FAILURE;
} else if (pid == 0) {
r = log_error_errno(errno, "fork(): %m");
goto finish;
}
if (pid == 0) {
/* Child */
@ -123,5 +124,6 @@ int main(int argc, char *argv[]) {
r = wait_for_terminate_and_warn("quotacheck", pid, true);
finish:
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}