[ioquake3] 38/59: [qcommon/msg.c] Remove dead code (which had undefined behaviour)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit fe111df610236923d7ad23b36209f5f9962fa0e3
Author: Thomas Köppe <tkoeppe at google.com>
Date:   Mon Sep 12 12:41:37 2016 +0100

    [qcommon/msg.c] Remove dead code (which had undefined behaviour)
---
 code/qcommon/msg.c | 66 +++++++++++++++++-------------------------------------
 1 file changed, 20 insertions(+), 46 deletions(-)

diff --git a/code/qcommon/msg.c b/code/qcommon/msg.c
index 397c603..20dec91 100644
--- a/code/qcommon/msg.c
+++ b/code/qcommon/msg.c
@@ -101,12 +101,9 @@ bit functions
 =============================================================================
 */
 
-int	overflows;
-
 // negative bit values include signs
 void MSG_WriteBits( msg_t *msg, int value, int bits ) {
 	int	i;
-//	FILE*	fp;
 
 	oldsize += bits;
 
@@ -120,69 +117,46 @@ void MSG_WriteBits( msg_t *msg, int value, int bits ) {
 		Com_Error( ERR_DROP, "MSG_WriteBits: bad bits %i", bits );
 	}
 
-	// check for overflows
-	if ( bits != 32 ) {
-		if ( bits > 0 ) {
-			if ( value > ( ( 1 << bits ) - 1 ) || value < 0 ) {
-				overflows++;
-			}
-		} else {
-			int	r;
-
-			r = 1 << (bits-1);
-
-			if ( value >  r - 1 || value < -r ) {
-				overflows++;
-			}
-		}
-	}
 	if ( bits < 0 ) {
 		bits = -bits;
 	}
-	if (msg->oob) {
-		if(bits==8)
-		{
+
+	if ( msg->oob ) {
+		if ( bits == 8 ) {
 			msg->data[msg->cursize] = value;
 			msg->cursize += 1;
 			msg->bit += 8;
-		}
-		else if(bits==16)
-		{
+		} else if ( bits == 16 ) {
 			short temp = value;
-			
-			CopyLittleShort(&msg->data[msg->cursize], &temp);
+
+			CopyLittleShort( &msg->data[msg->cursize], &temp );
 			msg->cursize += 2;
 			msg->bit += 16;
-		}
-		else if(bits==32)
-		{
-			CopyLittleLong(&msg->data[msg->cursize], &value);
+		} else if ( bits==32 ) {
+			CopyLittleLong( &msg->data[msg->cursize], &value );
 			msg->cursize += 4;
 			msg->bit += 32;
+		} else {
+			Com_Error( ERR_DROP, "can't write %d bits", bits );
 		}
-		else 
-			Com_Error(ERR_DROP, "can't write %d bits", bits);
 	} else {
-//		fp = fopen("c:\\netchan.bin", "a");
-		value &= (0xffffffff>>(32-bits));
-		if (bits&7) {
+		value &= (0xffffffff >> (32 - bits));
+		if ( bits&7 ) {
 			int nbits;
 			nbits = bits&7;
-			for(i=0;i<nbits;i++) {
-				Huff_putBit((value&1), msg->data, &msg->bit);
-				value = (value>>1);
+			for( i = 0; i < nbits; i++ ) {
+				Huff_putBit( (value & 1), msg->data, &msg->bit );
+				value = (value >> 1);
 			}
 			bits = bits - nbits;
 		}
-		if (bits) {
-			for(i=0;i<bits;i+=8) {
-//				fwrite(bp, 1, 1, fp);
-				Huff_offsetTransmit (&msgHuff.compressor, (value&0xff), msg->data, &msg->bit);
-				value = (value>>8);
+		if ( bits ) {
+			for( i = 0; i < bits; i += 8 ) {
+				Huff_offsetTransmit( &msgHuff.compressor, (value & 0xff), msg->data, &msg->bit );
+				value = (value >> 8);
 			}
 		}
-		msg->cursize = (msg->bit>>3)+1;
-//		fclose(fp);
+		msg->cursize = (msg->bit >> 3) + 1;
 	}
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git