ObjFW  Diff

Differences From Artifact [44d960865e]:

• File src/huffman_tree.m — part of check-in [6cbc2253b8] at 2018-06-03 18:15:06 on branch trunk — OFLHAArchive: Support for -lh[4567]- compression (user: js, size: 3051) [annotate] [blame] [check-ins using]

To Artifact [d14cb85d84]:

• File src/huffman_tree.m — part of check-in [44413ada84] at 2018-06-03 20:11:18 on branch trunk — Work around GCC being extremely buggy

  This includes GCC thinking uint16_t and uint_fast16_t have a different
  signedness and pointers to subclasses of OFStream and pointers to
  OFStream being incompatible pointer types. (user: js, size: 3032) [annotate] [blame] [check-ins using]

107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122

	tree->value = value;

	return tree;
}

bool
of_huffman_tree_walk(OFStream *stream,
    bool (*bitReader)(OFStream *, uint16_t *, uint8_t),
    struct of_huffman_tree **tree, uint16_t *value)
{
	struct of_huffman_tree *iter = *tree;
	uint16_t bits;

	while (iter->value == 0xFFFF) {
		if OF_UNLIKELY (!bitReader(stream, &bits, 1)) {

|
<

107
108
109
110
111
112
113
114

115
116
117
118
119
120
121

	tree->value = value;

	return tree;
}

bool
of_huffman_tree_walk(id stream, bool (*bitReader)(id, uint16_t *, uint8_t),

    struct of_huffman_tree **tree, uint16_t *value)
{
	struct of_huffman_tree *iter = *tree;
	uint16_t bits;

	while (iter->value == 0xFFFF) {
		if OF_UNLIKELY (!bitReader(stream, &bits, 1)) {