@@ -21,24 +21,24 @@ #import "OFHuffmanTree.h" #import "OFInvalidFormatException.h" #import "OFOutOfMemoryException.h" -static OFHuffmanTree * +static OFHuffmanTree newTree(void) { - OFHuffmanTree *tree; + OFHuffmanTree tree; tree = OFAllocMemory(1, sizeof(*tree)); tree->leaves[0] = tree->leaves[1] = NULL; tree->value = 0xFFFF; return tree; } static void -treeInsert(OFHuffmanTree *tree, uint16_t code, uint8_t length, uint16_t value) +treeInsert(OFHuffmanTree tree, uint16_t code, uint8_t length, uint16_t value) { while (length > 0) { uint8_t bit; length--; @@ -51,14 +51,14 @@ } tree->value = value; } -OFHuffmanTree * +OFHuffmanTree OFHuffmanTreeNew(uint8_t lengths[], uint16_t count) { - OFHuffmanTree *tree; + OFHuffmanTree tree; uint16_t *lengthCount = NULL; uint16_t code, maxCode = 0, *nextCode = NULL; uint_fast8_t maxBit = 0; @try { @@ -106,24 +106,24 @@ } return tree; } -OFHuffmanTree * +OFHuffmanTree OFHuffmanTreeNewSingle(uint16_t value) { - OFHuffmanTree *tree = newTree(); + OFHuffmanTree tree = newTree(); tree->value = value; return tree; } void -OFHuffmanTreeFree(OFHuffmanTree *tree) +OFHuffmanTreeFree(OFHuffmanTree tree) { for (uint_fast8_t i = 0; i < 2; i++) if OF_LIKELY (tree->leaves[i] != NULL) OFHuffmanTreeFree(tree->leaves[i]); OFFreeMemory(tree); }