bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid depending on side effects in assert(...) expressions

Browse source 
When building with -DNDEBUG, assert statements are compiled out to
no-ops. Thus, we can't depend on assignments or other computations
occurring inside the assert().

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Dave Reisner 2020-05-13 14:43:53 -04:00 • committed by Allan McRae
parent 3674144a74
commit 23b50d60e3
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/pacman/callback.c
View file

@ -862,12 +862,14 @@ static void dload_progress_event(const char *filename, alpm_download_event_progr
int64_t curr_time = get_time_ms(); int64_t curr_time = get_time_ms();
double last_chunk_rate; double last_chunk_rate;
int64_t timediff; int64_t timediff;
bool ok;
if(!dload_progressbar_enabled()) { if(!dload_progressbar_enabled()) {
return; return;
} }
assert(find_bar_for_filename(filename, &index, &bar)); ok = find_bar_for_filename(filename, &index, &bar);
assert(ok);
/* compute current average values */ /* compute current average values */
timediff = curr_time - bar->sync_time; timediff = curr_time - bar->sync_time;
@ -902,12 +904,14 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl
int index; int index;
struct pacman_progress_bar *bar; struct pacman_progress_bar *bar;
int64_t timediff; int64_t timediff;
bool ok;
if(!dload_progressbar_enabled()) { if(!dload_progressbar_enabled()) {
return; return;
} }
assert(find_bar_for_filename(filename, &index, &bar)); ok = find_bar_for_filename(filename, &index, &bar);
assert(ok);
bar->completed = true; bar->completed = true;
/* This may not have been initialized if the download finished before /* This may not have been initialized if the download finished before