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

fsck: remove unnecessary check

Browse Source 
gcc was complaining that progress_rc might be used uninitalized.
But it was actually always set, because the condition was always
satisfied. Remove the condition.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-03-03 00:02:31 -05:00
parent d873e8778c
commit 576a13eaf6
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/fsck/fsck.c
View File

@ -316,10 +316,8 @@ int main(int argc, char *argv[]) {
if (arg_force)
cmdline[i++] = "-f";
if (progress_pipe[1] >= 0) {
xsprintf(dash_c, "-C%i", progress_pipe[1]);
cmdline[i++] = dash_c;
}
xsprintf(dash_c, "-C%i", progress_pipe[1]);
cmdline[i++] = dash_c;
cmdline[i++] = device;
cmdline[i++] = NULL;
@ -330,18 +328,15 @@ int main(int argc, char *argv[]) {
goto finish;
} else if (pid == 0) {
/* Child */
if (progress_pipe[0] >= 0)
safe_close(progress_pipe[0]);
safe_close(progress_pipe[0]);
execv(cmdline[0], (char**) cmdline);
_exit(8); /* Operational error */
}
progress_pipe[1] = safe_close(progress_pipe[1]);
if (progress_pipe[0] >= 0) {
progress_rc = process_progress(progress_pipe[0], pid, st.st_rdev);
progress_pipe[0] = -1;
}
progress_rc = process_progress(progress_pipe[0], pid, st.st_rdev);
progress_pipe[0] = -1;
q = wait_for_terminate(pid, &status);
if (q < 0) {