dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed unused variables and fixed GCC warnings

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6259 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2012-09-08 02:50:09 +00:00
parent c6fdb4436d
commit 2d99d7ad3e
26 changed files with 124 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/bzip2/bzlib.c
View file

@ -520,7 +520,7 @@ static void NSISCALL unRLE_obuf_to_output_FAST ( DState* s )
Int32 c_k0 = s->k0;
UInt32 c_tPos = s->tPos;
char* cs_next_out = s->next_out;
char* cs_next_out = (char*) s->next_out;
unsigned int cs_avail_out = s->avail_out;
/* end restore */
@ -583,7 +583,7 @@ static void NSISCALL unRLE_obuf_to_output_FAST ( DState* s )
s->nblock_used = c_nblock_used;
s->k0 = c_k0;
s->tPos = c_tPos;
s->next_out = cs_next_out;
s->next_out = (unsigned char*) cs_next_out;
s->avail_out = cs_avail_out;
/* end save */
}

8
Source/bzip2/bzlib.h
View file

@ -146,10 +146,10 @@ typedef unsigned short UInt16;
#define mini_memcpy memcpy
typedef struct {
char *next_in;
unsigned char *next_in;
unsigned int avail_in;
char *next_out;
unsigned char *next_out;
unsigned int avail_out;
void *state;
@ -325,10 +325,10 @@ typedef struct {
typedef struct {
/* pointer back to the struct bz_stream */
char *next_in;
unsigned char *next_in;
unsigned int avail_in;
char *next_out;
unsigned char *next_out;
unsigned int avail_out;
/* state indicator for this stream */

7
Source/bzip2/compress.c
View file

@ -298,7 +298,7 @@ void sendMTFValues ( EState* s )
{
Int32 v, t, i, j, gs, ge, totc, bt, bc, iter;
Int32 nSelectors, alphaSize, minLen, maxLen, selCtr;
Int32 nGroups, nBytes;
Int32 nGroups;
/*--
UChar len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
@ -539,7 +539,6 @@ void sendMTFValues ( EState* s )
if (s->inUse[i * 16 + j]) inUse16[i] = True;
}
nBytes = s->numZ;
for (i = 0; i < 16; i++)
if (inUse16[i]) bsW(s,1,1); else bsW(s,1,0);
@ -552,7 +551,6 @@ void sendMTFValues ( EState* s )
}
/*--- Now the selectors. ---*/
nBytes = s->numZ;
bsW ( s, 3, nGroups );
bsW ( s, 15, nSelectors );
for (i = 0; i < nSelectors; i++) {
@ -561,8 +559,6 @@ void sendMTFValues ( EState* s )
}
/*--- Now the coding tables. ---*/
nBytes = s->numZ;
for (t = 0; t < nGroups; t++) {
Int32 curr = s->len[t][0];
bsW ( s, 5, curr );
@ -575,7 +571,6 @@ void sendMTFValues ( EState* s )
/*--- And finally, the block data proper ---*/
nBytes = s->numZ;
selCtr = 0;
gs = 0;
while (True) {