empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert run-time to build-time assertion

Browse source 
There's just one, in show_product().

Use new BUILD_ASSERT() there, because its contract is even simpler
than BUILD_ASSERT_ONE()'s.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-07-04 16:19:16 +02:00
parent 80bf4ec34b
commit d58bea5458
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/misc.h
View file

@ -82,6 +82,13 @@ extern void (*oops_handler)(void);
#define BUILD_ASSERT_ONE(cond) \ #define BUILD_ASSERT_ONE(cond) \
(sizeof(char[1 - 2 * !(cond)])) (sizeof(char[1 - 2 * !(cond)]))
/*
* Assert constant expression @cond.
* If @cond is zero, force a compilation error.
*/
#define BUILD_ASSERT(cond) \
((void)BUILD_ASSERT_ONE(cond))
void exit_nomem(void) ATTRIBUTE((noreturn)); void exit_nomem(void) ATTRIBUTE((noreturn));
/* return codes from command routines */ /* return codes from command routines */

2
src/lib/subs/show.c
View file

@ -516,7 +516,7 @@ show_product(int tlev)
pp->p_sname, pp->p_sname,
pp->p_type < 0 ? ' ' : ichr[pp->p_type].i_mnem, pp->p_type < 0 ? ' ' : ichr[pp->p_type].i_mnem,
pp->p_cost); pp->p_cost);
(void)CANT_HAPPEN(MAXPRCON > 3); /* output has only three columns */ BUILD_ASSERT(MAXPRCON <= 3); /* output has only three columns */
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (i < MAXPRCON && pp->p_camt[i] if (i < MAXPRCON && pp->p_camt[i]
&& pp->p_ctype[i] > I_NONE && pp->p_ctype[i] <= I_MAX) && pp->p_ctype[i] > I_NONE && pp->p_ctype[i] <= I_MAX)