bitstream: Replace check for impossible condition by assertion.

[paraslash.git] / bitstream.c

diff --git a/bitstream.c b/bitstream.c
index ce6729917621dda74f7a861906426b7f58e56031..492b407d235f7000e77c036e9ebf52412d5afc63 100644 (file)
--- a/bitstream.c
+++ b/bitstream.c
@@ -58,7 +58,7 @@ static int build_table(struct vlc *vlc, int table_nb_bits, int nb_codes,
                const void *bits, const void *codes, int codes_size,
                uint32_t code_prefix, int n_prefix)
 {
-       int i, j, k, n, table_size, table_index, nb, n1, idx, code_prefix2;
+       int i, j, k, n, table_size, table_index, nb, n1, idx;
        uint32_t code;
        VLC_TYPE(*table)[2];
 
@@ -81,18 +81,14 @@ static int build_table(struct vlc *vlc, int table_nb_bits, int nb_codes,
                        continue;
                GET_DATA(code, codes, i, codes_size);
                /* if code matches the prefix, it is in the table */
-               code_prefix2 = code >> n;
-               if (code_prefix2 != code_prefix)
+               if ((code >> n) != code_prefix)
                        continue;
                if (n <= table_nb_bits) {
                        /* no need to add another table */
                        j = (code << (table_nb_bits - n)) & (table_size - 1);
                        nb = 1 << (table_nb_bits - n);
                        for (k = 0; k < nb; k++) {
-                               if (table[j][1] /* bits */ != 0) {
-                                       PARA_EMERG_LOG("incorrect code\n");
-                                       exit(EXIT_FAILURE);
-                               }
+                               assert(table[j][1] == 0); /* incorrect code */
                                table[j][1] = n; /* bits */
                                table[j][0] = i;
                                j++;