Sort of garbage collection commit. :-| Many things are still

broken. API has changed a lot and it will still change a
little more here and there. The command line tool doesn't
have all the required changes to reflect the API changes, so
it's easy to get "internal error" or trigger assertions.

1 files changed, 10 insertions, 9 deletions

diff --git a/src/liblzma/rangecoder/price_table_gen.c b/src/liblzma/rangecoder/price_tablegen.c
index 946d8215..68513635 100644
--- a/src/liblzma/rangecoder/price_table_gen.c
+++ b/src/liblzma/rangecoder/price_tablegen.c
@@ -1,9 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 //
-/// \file       price_table_gen.c
+/// \file       price_tablegen.c
 /// \brief      Probability price table generator
 ///
-/// Compiling: gcc -std=c99 -o price_table_gen price_table_gen.c
+/// Compiling: gcc -std=c99 -o price_tablegen price_tablegen.c
 //
 //  Copyright (C) 2007 Lasse Collin
 //
@@ -19,10 +19,11 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include "range_common.h"
+#include "price.h"
 #include "price_table_init.c"
 
 
@@ -32,18 +33,18 @@ main(void)
 	lzma_rc_init();
 
 	printf("/* This file has been automatically generated by "
-			"price_table_gen.c. */\n\n"
+			"price_tablegen.c. */\n\n"
 			"#include \"range_encoder.h\"\n\n"
-			"const uint32_t lzma_rc_prob_prices["
-			"BIT_MODEL_TOTAL >> MOVE_REDUCING_BITS] = {");
+			"const uint32_t lzma_rc_prices["
+			"RC_PRICE_TABLE_SIZE] = {");
 
-	const size_t array_size = sizeof(lzma_rc_prob_prices)
-			/ sizeof(lzma_rc_prob_prices[0]);
+	const size_t array_size = sizeof(lzma_rc_prices)
+			/ sizeof(lzma_rc_prices[0]);
 	for (size_t i = 0; i < array_size; ++i) {
 		if (i % 8 == 0)
 			printf("\n\t");
 
-		printf("%4" PRIu32, lzma_rc_prob_prices[i]);
+		printf("%4" PRIu32, lzma_rc_prices[i]);
 
 		if (i != array_size - 1)
 			printf(",");