emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ditch longs and long longs in favor of stdint.h types, which has cascading

Browse source 
effects throughout, including use of inttypes.h/PRI[ud]64 because printf() is
still stuck in a long world, conversion of %lu to %zu for printing values of
type size_t, and changing/renaming the g_check_cmp* family of functions.
This commit is contained in:
Peter Johnson 2013-11-15 00:12:57 -05:00
parent f0a24ee4d0
commit c8fc061ea6
15 changed files with 64 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/t_bitreader.c
View file

@ -1,3 +1,4 @@
#include <stdint.h>
#include <glib.h>
#include "hammer.h"
#include "internal.h"
@ -15,44 +16,44 @@
static void test_bitreader_ints(void) {
HInputStream is = MK_INPUT_STREAM("\xFF\xFF\xFF\xFE\x00\x00\x00\x00", 8, BIT_BIG_ENDIAN | BYTE_BIG_ENDIAN);
g_check_cmplong(h_read_bits(&is, 64, true), ==, -0x200000000);
g_check_cmp_int64(h_read_bits(&is, 64, true), ==, -0x200000000);
}
static void test_bitreader_be(void) {
HInputStream is = MK_INPUT_STREAM("\x6A\x5A", 2, BIT_BIG_ENDIAN | BYTE_BIG_ENDIAN);
g_check_cmpint(h_read_bits(&is, 3, false), ==, 0x03);
g_check_cmpint(h_read_bits(&is, 8, false), ==, 0x52);
g_check_cmpint(h_read_bits(&is, 5, false), ==, 0x1A);
g_check_cmp_int32(h_read_bits(&is, 3, false), ==, 0x03);
g_check_cmp_int32(h_read_bits(&is, 8, false), ==, 0x52);
g_check_cmp_int32(h_read_bits(&is, 5, false), ==, 0x1A);
}
static void test_bitreader_le(void) {
HInputStream is = MK_INPUT_STREAM("\x6A\x5A", 2, BIT_LITTLE_ENDIAN | BYTE_LITTLE_ENDIAN);
g_check_cmpint(h_read_bits(&is, 3, false), ==, 0x02);
g_check_cmpint(h_read_bits(&is, 8, false), ==, 0x4D);
g_check_cmpint(h_read_bits(&is, 5, false), ==, 0x0B);
g_check_cmp_int32(h_read_bits(&is, 3, false), ==, 0x02);
g_check_cmp_int32(h_read_bits(&is, 8, false), ==, 0x4D);
g_check_cmp_int32(h_read_bits(&is, 5, false), ==, 0x0B);
}
static void test_largebits_be(void) {
HInputStream is = MK_INPUT_STREAM("\x6A\x5A", 2, BIT_BIG_ENDIAN | BYTE_BIG_ENDIAN);
g_check_cmpint(h_read_bits(&is, 11, false), ==, 0x352);
g_check_cmpint(h_read_bits(&is, 5, false), ==, 0x1A);
g_check_cmp_int32(h_read_bits(&is, 11, false), ==, 0x352);
g_check_cmp_int32(h_read_bits(&is, 5, false), ==, 0x1A);
}
static void test_largebits_le(void) {
HInputStream is = MK_INPUT_STREAM("\x6A\x5A", 2, BIT_LITTLE_ENDIAN | BYTE_LITTLE_ENDIAN);
g_check_cmpint(h_read_bits(&is, 11, false), ==, 0x26A);
g_check_cmpint(h_read_bits(&is, 5, false), ==, 0x0B);
g_check_cmp_int32(h_read_bits(&is, 11, false), ==, 0x26A);
g_check_cmp_int32(h_read_bits(&is, 5, false), ==, 0x0B);
}
static void test_offset_largebits_be(void) {
HInputStream is = MK_INPUT_STREAM("\x6A\x5A", 2, BIT_BIG_ENDIAN | BYTE_BIG_ENDIAN);
g_check_cmpint(h_read_bits(&is, 5, false), ==, 0xD);
g_check_cmpint(h_read_bits(&is, 11, false), ==, 0x25A);
g_check_cmp_int32(h_read_bits(&is, 5, false), ==, 0xD);
g_check_cmp_int32(h_read_bits(&is, 11, false), ==, 0x25A);
}
static void test_offset_largebits_le(void) {
HInputStream is = MK_INPUT_STREAM("\x6A\x5A", 2, BIT_LITTLE_ENDIAN | BYTE_LITTLE_ENDIAN);
g_check_cmpint(h_read_bits(&is, 5, false), ==, 0xA);
g_check_cmpint(h_read_bits(&is, 11, false), ==, 0x2D3);
g_check_cmp_int32(h_read_bits(&is, 5, false), ==, 0xA);
g_check_cmp_int32(h_read_bits(&is, 11, false), ==, 0x2D3);
}