From: Benjamin Robin Date: Wed, 6 May 2020 18:30:43 +0000 (+0200) Subject: tree-wide: Fix, replace assert() by assert_se() when there is side effect X-Git-Tag: v245.6~62 X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=6960efd198920745f0f227f30813419615ff6319;p=systemd%2F.git tree-wide: Fix, replace assert() by assert_se() when there is side effect (cherry picked from commit f391597c6712ad90db37fe4a79047a45f4aca86a) --- diff --git a/src/import/import-fs.c b/src/import/import-fs.c index 468303a6dc..5e61049ced 100644 --- a/src/import/import-fs.c +++ b/src/import/import-fs.c @@ -172,8 +172,8 @@ static int import_fs(int argc, char *argv[], void *userdata) { progress.limit = (RateLimit) { 200*USEC_PER_MSEC, 1 }; /* Hook into SIGINT/SIGTERM, so that we can cancel things then */ - assert(sigaction(SIGINT, &sa, &old_sigint_sa) >= 0); - assert(sigaction(SIGTERM, &sa, &old_sigterm_sa) >= 0); + assert_se(sigaction(SIGINT, &sa, &old_sigint_sa) >= 0); + assert_se(sigaction(SIGTERM, &sa, &old_sigterm_sa) >= 0); r = btrfs_subvol_snapshot_fd_full( fd, diff --git a/src/partition/repart.c b/src/partition/repart.c index fcc634f220..b7b1a0a6f3 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -1722,7 +1722,7 @@ static int context_dump_partition_bar(Context *context, const char *node) { bool z = false; size_t c, j = 0; - assert((c = columns()) >= 2); + assert_se((c = columns()) >= 2); c -= 2; /* We do not use the leftmost and rightmost character cell */ bar = new0(Partition*, c);