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
Contrib/Library/LibraryLocal/LibraryLocal.cpp
View file

@ -153,8 +153,8 @@ int _tmain(int argc, TCHAR* argv[])
}
else
{
fprintf(fHdr, "!define LIBRARY_VERSION_HIGH %u\n", high);
fprintf(fHdr, "!define LIBRARY_VERSION_LOW %u\n", low);
fprintf(fHdr, "!define LIBRARY_VERSION_HIGH %lu\n", high);
fprintf(fHdr, "!define LIBRARY_VERSION_LOW %lu\n", low);
}
fclose(fHdr);

18
Contrib/Makensisw/jnetlib/connection.cpp
View file

@ -30,7 +30,7 @@ JNL_Connection::JNL_Connection(JNL_AsyncDNS *dns, int sendbufsize, int recvbufsi
m_send_buffer_len=sendbufsize;
m_recv_buffer=(char*)malloc(m_recv_buffer_len);
m_send_buffer=(char*)malloc(m_send_buffer_len);
m_socket=-1;
m_socket=INVALID_SOCKET;
memset(m_recv_buffer,0,recvbufsize);
memset(m_send_buffer,0,sendbufsize);
m_remote_port=0;
@ -41,7 +41,7 @@ JNL_Connection::JNL_Connection(JNL_AsyncDNS *dns, int sendbufsize, int recvbufsi
memset(&m_saddr,0,sizeof(m_saddr));
}
void JNL_Connection::connect(int s, struct sockaddr_in *loc)
void JNL_Connection::connect(PORTABLE_SOCKET s, struct sockaddr_in *loc)
{
close(1);
m_socket=s;
@ -49,7 +49,7 @@ void JNL_Connection::connect(int s, struct sockaddr_in *loc)
m_dns=NULL;
if (loc) m_saddr=*loc;
else memset(&m_saddr,0,sizeof(m_saddr));
if (m_socket != -1)
if (m_socket != INVALID_SOCKET)
{
SET_SOCK_BLOCK(m_socket,0);
m_state=STATE_CONNECTED;
@ -66,7 +66,7 @@ void JNL_Connection::connect(char *hostname, int port)
close(1);
m_remote_port=(short)port;
m_socket=::socket(AF_INET,SOCK_STREAM,0);
if (m_socket==-1)
if (m_socket==INVALID_SOCKET)
{
m_errorstr="creating socket";
m_state=STATE_ERROR;
@ -94,11 +94,11 @@ void JNL_Connection::connect(char *hostname, int port)
JNL_Connection::~JNL_Connection()
{
if (m_socket >= 0)
if (m_socket != INVALID_SOCKET)
{
::shutdown(m_socket, SHUT_RDWR);
::closesocket(m_socket);
m_socket=-1;
m_socket=INVALID_SOCKET;
}
free(m_recv_buffer);
free(m_send_buffer);
@ -280,12 +280,12 @@ void JNL_Connection::close(int quick)
if (quick || m_state == STATE_RESOLVING || m_state == STATE_CONNECTING)
{
m_state=STATE_CLOSED;
if (m_socket >= 0)
if (m_socket != INVALID_SOCKET)
{
::shutdown(m_socket, SHUT_RDWR);
::closesocket(m_socket);
}
m_socket=-1;
m_socket=INVALID_SOCKET;
memset(m_recv_buffer,0,m_recv_buffer_len);
memset(m_send_buffer,0,m_send_buffer_len);
m_remote_port=0;
@ -440,7 +440,7 @@ int JNL_Connection::recv_line(char *line, int maxlength)
unsigned long JNL_Connection::get_interface(void)
{
if (m_socket==-1) return 0;
if (m_socket==INVALID_SOCKET) return 0;
struct sockaddr_in sin;
memset(&sin,0,sizeof(sin));
socklen_t len=16;

5
Contrib/Makensisw/jnetlib/connection.h
View file

@ -58,6 +58,7 @@
#define _CONNECTION_H_
#include "asyncdns.h"
#include "netinc.h"
#define JNL_CONNECTION_AUTODNS ((JNL_AsyncDNS*)-1)
@ -79,7 +80,7 @@ class JNL_Connection
~JNL_Connection();
void connect(char *hostname, int port);
void connect(int sock, struct sockaddr_in *loc=NULL); // used by the listen object, usually not needed by users.
void connect(PORTABLE_SOCKET sock, struct sockaddr_in *loc=NULL); // used by the listen object, usually not needed by users.
void run(int max_send_bytes=-1, int max_recv_bytes=-1, int *bytes_sent=NULL, int *bytes_rcvd=NULL);
int get_state() { return m_state; }
@ -109,7 +110,7 @@ class JNL_Connection
short get_remote_port(void) { return m_remote_port; } // this returns the remote port of connection
protected:
int m_socket;
PORTABLE_SOCKET m_socket;
short m_remote_port;
char *m_recv_buffer;
char *m_send_buffer;

6
Contrib/Makensisw/jnetlib/netinc.h
View file

@ -22,6 +22,7 @@
#include <time.h>
#define strcasecmp(x,y) stricmp(x,y)
#define ERRNO (WSAGetLastError())
#define PORTABLE_SOCKET SOCKET
#define SET_SOCK_BLOCK(s,block) { unsigned long __i=block?0:1; ioctlsocket(s,FIONBIO,&__i); }
#define EWOULDBLOCK WSAEWOULDBLOCK
#define EINPROGRESS WSAEWOULDBLOCK
@ -53,6 +54,7 @@ typedef int socklen_t;
#include <string.h>
#define ERRNO errno
#define PORTABLE_SOCKET int
#define closesocket(s) close(s)
#define SET_SOCK_BLOCK(s,block) { int __flags; if ((__flags = fcntl(s, F_GETFL, 0)) != -1) { if (!block) __flags |= O_NONBLOCK; else __flags &= ~O_NONBLOCK; fcntl(s, F_SETFL, __flags); } }
@ -74,6 +76,10 @@ typedef int socklen_t;
#define SHUT_RDWR 2
#endif
#ifndef INVALID_SOCKET
#define INVALID_SOCKET -1
#endif
extern void mini_memset(void *,char,int);
extern void mini_memcpy(void *,void*,int);
#define memset mini_memset

12
Contrib/Makensisw/makensisw.cpp
View file

@ -319,7 +319,6 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
}
else {
int this_compressor=0;
int last_compressor;
int i;
HANDLE hPrev, hThis;
DWORD prevSize=0, thisSize=0;
@ -328,7 +327,6 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
for(i=(int)COMPRESSOR_SCRIPT+2; i<(int)COMPRESSOR_BEST; i++) {
if(!lstrcmpi(g_sdata.compressor_name,compressor_names[i])) {
this_compressor = i;
last_compressor = i-1;
break;
}
}
@ -937,12 +935,11 @@ BOOL CALLBACK SettingsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_INITDIALOG:
{
int i = 0;
LRESULT rv;
for(i = (int)COMPRESSOR_SCRIPT; i <= (int)COMPRESSOR_BEST; i++) {
rv = SendDlgItemMessage(hwndDlg, IDC_COMPRESSOR, CB_ADDSTRING, 0, (LPARAM)compressor_display_names[i]);
SendDlgItemMessage(hwndDlg, IDC_COMPRESSOR, CB_ADDSTRING, 0, (LPARAM)compressor_display_names[i]);
}
rv = SendDlgItemMessage(hwndDlg, IDC_COMPRESSOR, CB_SETCURSEL, (WPARAM)g_sdata.default_compressor, (LPARAM)0);
SendDlgItemMessage(hwndDlg, IDC_COMPRESSOR, CB_SETCURSEL, (WPARAM)g_sdata.default_compressor, (LPARAM)0);
SetSymbols(hwndDlg, g_sdata.symbols);
SetFocus(GetDlgItem(hwndDlg, IDC_SYMBOL));
@ -1127,12 +1124,11 @@ BOOL CALLBACK CompressorProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
case WM_INITDIALOG:
{
int i=0;
LRESULT rv;
for(i=(int)COMPRESSOR_SCRIPT; i<= (int)COMPRESSOR_BEST; i++) {
rv = SendDlgItemMessage(hwndDlg, IDC_COMPRESSOR, CB_ADDSTRING, 0, (LPARAM)compressor_display_names[i]);
SendDlgItemMessage(hwndDlg, IDC_COMPRESSOR, CB_ADDSTRING, 0, (LPARAM)compressor_display_names[i]);
}
rv = SendDlgItemMessage(hwndDlg, IDC_COMPRESSOR, CB_SETCURSEL, (WPARAM)g_sdata.compressor, (LPARAM)0);
SendDlgItemMessage(hwndDlg, IDC_COMPRESSOR, CB_SETCURSEL, (WPARAM)g_sdata.compressor, (LPARAM)0);
SetFocus(GetDlgItem(hwndDlg, IDC_COMPRESSOR));
break;

2
Contrib/NSISdl/asyncdns.cpp
View file

@ -27,7 +27,7 @@ JNL_AsyncDNS::~JNL_AsyncDNS()
wait_for_thread_death();
}
unsigned long WINAPI JNL_AsyncDNS::_threadfunc(LPVOID _d)
DWORD WINAPI JNL_AsyncDNS::_threadfunc(LPVOID _d)
{
JNL_AsyncDNS *_this=(JNL_AsyncDNS*)_d;
struct hostent *hostentry;

22
Contrib/NSISdl/connection.cpp
View file

@ -30,7 +30,7 @@ JNL_Connection::JNL_Connection(JNL_AsyncDNS *dns, int sendbufsize, int recvbufsi
m_send_buffer_len=sendbufsize;
m_recv_buffer=(char*)malloc(m_recv_buffer_len);
m_send_buffer=(char*)malloc(m_send_buffer_len);
m_socket=-1;
m_socket=INVALID_SOCKET;
m_remote_port=0;
m_state=STATE_NOCONNECTION;
m_recv_len=m_recv_pos=0;
@ -39,7 +39,7 @@ JNL_Connection::JNL_Connection(JNL_AsyncDNS *dns, int sendbufsize, int recvbufsi
memset(&m_saddr,0,sizeof(m_saddr));
}
void JNL_Connection::connect(int s, struct sockaddr_in *loc)
void JNL_Connection::connect(PORTABLE_SOCKET s, struct sockaddr_in *loc)
{
close(1);
m_socket=s;
@ -47,7 +47,7 @@ void JNL_Connection::connect(int s, struct sockaddr_in *loc)
m_dns=NULL;
if (loc) m_saddr=*loc;
else memset(&m_saddr,0,sizeof(m_saddr));
if (m_socket != -1)
if (m_socket != INVALID_SOCKET)
{
SET_SOCK_BLOCK(m_socket,0);
m_state=STATE_CONNECTED;
@ -64,7 +64,7 @@ void JNL_Connection::connect(char *hostname, int port)
close(1);
m_remote_port=(short)port;
m_socket=::socket(AF_INET,SOCK_STREAM,0);
if (m_socket==-1)
if (m_socket==INVALID_SOCKET)
{
m_errorstr="creating socket";
m_state=STATE_ERROR;
@ -83,7 +83,7 @@ void JNL_Connection::connect(char *hostname, int port)
else
{
m_state=STATE_RESOLVING;
m_saddr.sin_family=AF_INET;
m_saddr.sin_family=AF_INET;
m_saddr.sin_port=htons((unsigned short)port);
m_saddr.sin_addr.s_addr=inet_addr(hostname);
}
@ -92,11 +92,11 @@ void JNL_Connection::connect(char *hostname, int port)
JNL_Connection::~JNL_Connection()
{
if (m_socket >= 0)
if (m_socket != INVALID_SOCKET)
{
::shutdown(m_socket, SHUT_RDWR);
::closesocket(m_socket);
m_socket=-1;
m_socket=INVALID_SOCKET;
}
free(m_recv_buffer);
free(m_send_buffer);
@ -145,7 +145,7 @@ void JNL_Connection::run(int max_send_bytes, int max_recv_bytes, int *bytes_sent
else { m_state=STATE_CONNECTING; }
break;
case STATE_CONNECTING:
{
{
fd_set f[3];
FD_ZERO(&f[0]);
FD_ZERO(&f[1]);
@ -278,12 +278,12 @@ void JNL_Connection::close(int quick)
if (quick || m_state == STATE_RESOLVING || m_state == STATE_CONNECTING)
{
m_state=STATE_CLOSED;
if (m_socket >= 0)
if (m_socket != INVALID_SOCKET)
{
::shutdown(m_socket, SHUT_RDWR);
::closesocket(m_socket);
}
m_socket=-1;
m_socket=INVALID_SOCKET;
memset(m_recv_buffer,0,m_recv_buffer_len);
memset(m_send_buffer,0,m_send_buffer_len);
m_remote_port=0;
@ -438,7 +438,7 @@ int JNL_Connection::recv_line(char *line, int maxlength)
unsigned long JNL_Connection::get_interface(void)
{
if (m_socket==-1) return 0;
if (m_socket==INVALID_SOCKET) return 0;
struct sockaddr_in sin;
memset(&sin,0,sizeof(sin));
socklen_t len=16;

5
Contrib/NSISdl/connection.h
View file

@ -59,6 +59,7 @@
#define _CONNECTION_H_
#include "asyncdns.h"
#include "netinc.h"
#define JNL_CONNECTION_AUTODNS ((JNL_AsyncDNS*)-1)
@ -80,7 +81,7 @@ class JNL_Connection
~JNL_Connection();
void connect(char *hostname, int port);
void connect(int sock, struct sockaddr_in *loc=NULL); // used by the listen object, usually not needed by users.
void connect(PORTABLE_SOCKET sock, struct sockaddr_in *loc=NULL); // used by the listen object, usually not needed by users.
void run(int max_send_bytes=-1, int max_recv_bytes=-1, int *bytes_sent=NULL, int *bytes_rcvd=NULL);
int get_state() { return m_state; }
@ -110,7 +111,7 @@ class JNL_Connection
short get_remote_port(void) { return m_remote_port; } // this returns the remote port of connection
protected:
int m_socket;
PORTABLE_SOCKET m_socket;
short m_remote_port;
char *m_recv_buffer;
char *m_send_buffer;

6
Contrib/NSISdl/netinc.h
View file

@ -43,4 +43,10 @@ typedef int socklen_t;
#define SHUT_RDWR 2
#endif
#ifndef INVALID_SOCKET
#define INVALID_SOCKET -1
#endif
#define PORTABLE_SOCKET SOCKET
#endif //_NETINC_H_

17
Contrib/System/Source/System.c
View file

@ -636,7 +636,14 @@ SystemProc *PrepareProc(BOOL NeedForCall)
case _T('0'): case _T('1'): case _T('2'): case _T('3'): case _T('4'):
case _T('5'): case _T('6'): case _T('7'): case _T('8'): case _T('9'):
// Numeric inline
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" // temp3 is set to 0 when we start parsing a new parameter
#endif
if (temp3 == 0)
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
{
ib--;
// It's stupid, I know, but I'm too lazy to do another thing
@ -704,7 +711,14 @@ SystemProc *PrepareProc(BOOL NeedForCall)
if (temp3 == 1)
proc->Params[ParamIndex].Output = temp4;
// Next parameter is output or something else
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
temp3++;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
ChangesDone = PCD_DONE;
@ -1156,9 +1170,10 @@ void CallStruct(SystemProc *proc)
// Special
size = (proc->Params[i].Option-1) * ByteSizeByType[proc->Params[i].Type];
ptr = NULL;
switch (proc->Params[i].Type)
{
case PAT_VOID: ptr = NULL; break;
case PAT_VOID: break;
case PAT_LONG:
// real structure size
proc->Params[i].Value = structsize;

4
Contrib/VPatch/Source/GenPat/GlobalTypes.h
View file

@ -102,7 +102,7 @@ public:
{
size_t cbio = fread(s, 1, n, m_File);
m_LastReadCount = cbio;
if (cbio != n)
if (cbio != (size_t)n)
{
m_state |= ferror(m_File) ? ios_base::badbit : (ios_base::eofbit|ios_base::failbit);
}
@ -126,7 +126,7 @@ public:
simplebfstream& write(const char* s, streamsize n)
{
size_t cbio = fwrite(s, 1, n, m_File);
if (cbio != n) m_state |= ios_base::badbit;
if (cbio != (size_t)n) m_state |= ios_base::badbit;
return *this;
}