Replace div_up() and round_up() functions with macros.

This commit is contained in:
Vreixo Formoso
2008-01-19 13:45:56 +01:00
parent df5aa263ec
commit 3361e941a6
9 changed files with 37 additions and 47 deletions

View File

@ -55,23 +55,23 @@ static void test_strconv()
static void test_div_up()
{
CU_ASSERT_EQUAL( div_up(1, 2), 1 );
CU_ASSERT_EQUAL( div_up(2, 2), 1 );
CU_ASSERT_EQUAL( div_up(0, 2), 0 );
CU_ASSERT_EQUAL( div_up(-1, 2), 0 );
CU_ASSERT_EQUAL( div_up(3, 2), 2 );
CU_ASSERT_EQUAL( DIV_UP(1, 2), 1 );
CU_ASSERT_EQUAL( DIV_UP(2, 2), 1 );
CU_ASSERT_EQUAL( DIV_UP(0, 2), 0 );
CU_ASSERT_EQUAL( DIV_UP(-1, 2), 0 );
CU_ASSERT_EQUAL( DIV_UP(3, 2), 2 );
}
static void test_round_up()
{
CU_ASSERT_EQUAL( round_up(1, 2), 2 );
CU_ASSERT_EQUAL( round_up(2, 2), 2 );
CU_ASSERT_EQUAL( round_up(0, 2), 0 );
CU_ASSERT_EQUAL( round_up(-1, 2), 0 );
CU_ASSERT_EQUAL( round_up(3, 2), 4 );
CU_ASSERT_EQUAL( round_up(15, 7), 21 );
CU_ASSERT_EQUAL( round_up(13, 7), 14 );
CU_ASSERT_EQUAL( round_up(14, 7), 14 );
CU_ASSERT_EQUAL( ROUND_UP(1, 2), 2 );
CU_ASSERT_EQUAL( ROUND_UP(2, 2), 2 );
CU_ASSERT_EQUAL( ROUND_UP(0, 2), 0 );
CU_ASSERT_EQUAL( ROUND_UP(-1, 2), 0 );
CU_ASSERT_EQUAL( ROUND_UP(3, 2), 4 );
CU_ASSERT_EQUAL( ROUND_UP(15, 7), 21 );
CU_ASSERT_EQUAL( ROUND_UP(13, 7), 14 );
CU_ASSERT_EQUAL( ROUND_UP(14, 7), 14 );
}
static void test_iso_lsb_msb()
@ -695,8 +695,8 @@ void add_util_suite()
CU_pSuite pSuite = CU_add_suite("UtilSuite", NULL, NULL);
CU_add_test(pSuite, "strconv()", test_strconv);
CU_add_test(pSuite, "div_up()", test_div_up);
CU_add_test(pSuite, "round_up()", test_round_up);
CU_add_test(pSuite, "DIV_UP()", test_div_up);
CU_add_test(pSuite, "ROUND_UP()", test_round_up);
CU_add_test(pSuite, "iso_bb()", test_iso_bb);
CU_add_test(pSuite, "iso_lsb/msb()", test_iso_lsb_msb);
CU_add_test(pSuite, "iso_read_lsb/msb()", test_iso_read_lsb_msb);