[Scummvm-cvs-logs] scummvm master -> a1998abed4fd8e1abfc7cc5cb97978999849a29e

digitall dgturner at iee.org
Sat Oct 5 08:01:36 CEST 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a1998abed4 COMMON: Fix missing arjDecoder class variable init. CID 1002929


Commit: a1998abed4fd8e1abfc7cc5cb97978999849a29e
    https://github.com/scummvm/scummvm/commit/a1998abed4fd8e1abfc7cc5cb97978999849a29e
Author: D G Turner (digitall at scummvm.org)
Date: 2013-10-04T23:02:18-07:00

Commit Message:
COMMON: Fix missing arjDecoder class variable init. CID 1002929

This fixes a couple of these variables by removing them as they
are unused or set-but-unused variables.

Changed paths:
    common/unarj.cpp



diff --git a/common/unarj.cpp b/common/unarj.cpp
index fe3c17a..e8aed7c 100644
--- a/common/unarj.cpp
+++ b/common/unarj.cpp
@@ -95,6 +95,12 @@ class ArjDecoder {
 public:
 	ArjDecoder(const ArjHeader *hdr) {
 		_compsize = hdr->compSize;
+		_compressed = 0;
+		_outstream = 0;
+		_bitbuf = 0;
+		_bytebuf = 0;
+		_bitcount = 0;
+		_blocksize = 0;
 	}
 
 	~ArjDecoder() {
@@ -112,7 +118,6 @@ public:
 	uint16 _bitbuf;
 	uint16 _bytebuf;
 	int32 _compsize;
-	byte _subbitbuf;
 	int _bitcount;
 
 	void init_getbits();
@@ -132,9 +137,6 @@ public:
 private:
 	byte  _ntext[ARJ_FDICSIZ];
 
-	int16  _getlen;
-	int16  _getbuf;
-
 	uint16 _left[2 * ARJ_NC - 1];
 	uint16 _right[2 * ARJ_NC - 1];
 	byte  _c_len[ARJ_NC];
@@ -656,7 +658,6 @@ void ArjDecoder::decode_f(int32 origsize) {
 
 	init_getbits();
 	ncount = 0;
-	_getlen = _getbuf = 0;
 	r = 0;
 
 	while (ncount < (uint32)origsize) {






More information about the Scummvm-git-logs mailing list