From: Andre Noll <maan@systemlinux.org>
Date: Sun, 18 Oct 2009 13:28:06 +0000 (+0200)
Subject: save one level of indentation in build_table().
X-Git-Tag: v0.4.1~71
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=d06e0fc014b8557556951a78ae4c07b5bba2052f;hp=3231d60840731fa0197e765a5e0dfa707ec3746a

save one level of indentation in build_table().
---

diff --git a/bitstream.c b/bitstream.c
index e6360e6a..dedcdead 100644
--- a/bitstream.c
+++ b/bitstream.c
@@ -83,29 +83,29 @@ static int build_table(struct vlc *vlc, int table_nb_bits, int nb_codes,
 		/* if code matches the prefix, it is in the table */
 		n -= n_prefix;
 		code_prefix2 = code >> n;
-		if (n > 0 && code_prefix2 == code_prefix) {
-			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("detected incorrect code\n");
-						exit(EXIT_FAILURE);
-					}
-					table[j][1] = n;	//bits
-					table[j][0] = symbol;
-					j++;
+		if (n <= 0 || code_prefix2 != 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);
 				}
-			} else {
-				n -= table_nb_bits;
-				j = (code >> n) & ((1 << table_nb_bits) - 1);
-				/* compute table size */
-				n1 = -table[j][1];	//bits
-				if (n > n1)
-					n1 = n;
-				table[j][1] = -n1;	//bits
+				table[j][1] = n;	//bits
+				table[j][0] = symbol;
+				j++;
 			}
+		} else {
+			n -= table_nb_bits;
+			j = (code >> n) & ((1 << table_nb_bits) - 1);
+			/* compute table size */
+			n1 = -table[j][1];	//bits
+			if (n > n1)
+				n1 = n;
+			table[j][1] = -n1;	//bits
 		}
 	}
 
@@ -156,8 +156,7 @@ void init_vlc(struct vlc *vlc, int nb_bits, int nb_codes, const void *bits,
 	vlc->table = NULL;
 	vlc->table_allocated = 0;
 	vlc->table_size = 0;
-	build_table(vlc, nb_bits, nb_codes, bits,
-		codes, codes_size, 0, 0);
+	build_table(vlc, nb_bits, nb_codes, bits, codes, codes_size, 0, 0);
 }
 
 void free_vlc(struct vlc *vlc)