diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-07-23 10:10:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-23 10:10:53 +0200 |
| commit | 1415e04603b7c243d70a70231d7d3eb184224597 (patch) | |
| tree | fc4f6bef0fb8782665a90f015eacdb13e949cab4 /src/gpt-auto-generator/gpt-auto-generator.c | |
| parent | 771de3f506ac5b9f5846acae70d8e558d969d018 (diff) | |
| parent | 476b8254d95488d09eebdbd175494aaafac23a3e (diff) | |
Merge pull request #3785 from keszybz/less-return-errno
Use "return log_error_errno(...)" in more places + related fixes
Diffstat (limited to 'src/gpt-auto-generator/gpt-auto-generator.c')
| -rw-r--r-- | src/gpt-auto-generator/gpt-auto-generator.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index a4938a7c3a..39355de953 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -489,10 +489,8 @@ static int add_boot(const char *what) { return 0; } - if (r < 0) { - log_error_errno(r, "Failed to read ESP partition UUID: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to read ESP partition UUID: %m"); errno = 0; b = blkid_new_probe_from_filename(what); |