fix some gcc 4.2 warnings

svn path=/trunk/; revision=25529
This commit is contained in:
Christoph von Wittich
2007-01-19 10:14:29 +00:00
parent a356a76c21
commit 7f361aca5b
5 changed files with 20 additions and 22 deletions
@@ -460,8 +460,7 @@ TbdCreateToolbarWnd(PTOOLBAR_DOCKS TbDocks,
if (Drag)
{
SetCursor(LoadCursor(NULL,
MAKEINTRESOURCE(IDC_ARROW)));
SetCursor(LoadCursor(NULL, IDC_ARROW));
SendMessage(hToolbar,
WM_NCLBUTTONDOWN,
HTCAPTION,
@@ -936,8 +935,7 @@ RebarSubclassProc(HWND hWnd,
&pt,
1);
SetCursor(LoadCursor(NULL,
MAKEINTRESOURCE(IDC_SIZEALL)));
SetCursor(LoadCursor(NULL, IDC_SIZEALL));
SendMessage(TbDocks->hRebar[DragTo],
WM_LBUTTONDOWN,
@@ -102,36 +102,36 @@ VOID CSocket::Close()
// Constructor with serversocket as parameter
CServerClientSocket::CServerClientSocket(LPCServerSocket lpServerSocket)
{
ServerSocket = lpServerSocket;
ServerSocket = lpServerSocket;
}
// Transmit data to socket
INT CServerClientSocket::Transmit( LPSTR lpsBuffer, UINT nLength)
INT CServerClientSocket::Transmit( LPCSTR lpsBuffer, UINT nLength)
{
return send(Socket, lpsBuffer, nLength, 0);
}
// Send a string to socket
INT CServerClientSocket::SendText( LPSTR lpsText)
INT CServerClientSocket::SendText( LPCSTR lpsText)
{
static CHAR crlf[3] = {0x0D, 0x0A, 0x00};
INT nCount;
INT nCount;
nCount = Transmit(lpsText, strlen(lpsText));
nCount += Transmit(crlf, strlen(crlf));
return nCount;
nCount += Transmit(crlf, strlen(crlf));
return nCount;
}
// Receive data from socket
INT CServerClientSocket::Receive(LPSTR lpsBuffer, UINT nLength)
{
return recv(Socket, lpsBuffer, nLength, 0);
return recv(Socket, lpsBuffer, nLength, 0);
}
// Process winsock messages if any
VOID CServerClientSocket::MessageLoop()
{
UINT nStatus;
UINT nStatus;
WSANETWORKEVENTS NetworkEvents;
nStatus = WSAWaitForMultipleEvents(1, &Event, FALSE, 0, FALSE);
@@ -41,7 +41,7 @@ CHttpClient::CHttpClient(CServerSocket *serversocket)
VOID CHttpClient::SplitUri(LPSTR lpsUri, LPSTR lpsHost, LPSTR lpsResource, LPSTR lpsParams)
{
LPSTR lpsPos;
LPSTR lpsStr;
LPSTR lpsStr;
UINT i;
strcpy(lpsHost, "");
@@ -118,7 +118,7 @@ VOID CHttpClient::SplitResource(LPSTR lpsResource, LPSTR lpsPath, LPSTR lpsFilen
VOID CHttpClient::ProcessRequest()
{
CHAR sStr[255];
CHAR sHost[255];
CHAR sHost[255];
CHAR sResource[255];
CHAR sParams[255];
@@ -145,7 +145,7 @@ VOID CHttpClient::ProcessRequest()
}
}
strcpy(sStr, pConfiguration->GetHttpBase());
strcat(sStr, sResource);
strcat(sStr, sResource);
SendFile(sStr);
break;
}
@@ -212,7 +212,7 @@ VOID CHttpClient::SendFile(LPSTR lpsFilename)
return;
}
SendText("HTTP/1.1 200 OK");
SendText("HTTP/1.1 200 OK");
SendText("Server: ROSHTTPD");
SendText("MIME-version: 1.0");
SendText("Content-Type: text/plain");
@@ -260,7 +260,7 @@ VOID CHttpClient::SendFile(LPSTR lpsFilename)
}
// Report something to client
VOID CHttpClient::Report(LPSTR lpsCode, LPSTR lpsStr)
VOID CHttpClient::Report(LPCSTR lpsCode, LPSTR lpsStr)
{
CHAR sTmp[128];
CHAR sTmp2[16];
@@ -37,7 +37,7 @@ public:
void SplitResource(const LPSTR lpsResource, LPSTR lpsPath, LPSTR lpsFilename, LPSTR lpsExtension);
void ProcessRequest();
void SendFile(const LPSTR lpsFilename);
void Report(const LPSTR lpsCode, const LPSTR lpsStr);
void Report(LPCSTR lpsCode, const LPSTR lpsStr);
private:
BOOL bStop;
LPSTR lpsBuffer;
@@ -82,9 +82,9 @@ public:
virtual VOID SetPort( UINT nPort) {};
virtual VOID Open();
virtual VOID Close();
virtual INT Transmit( LPSTR lpsBuffer, UINT nLength) { return 0; };
virtual INT Transmit( LPCSTR lpsBuffer, UINT nLength) { return 0; };
virtual INT Receive(LPSTR lpsBuffer, UINT nLength) { return 0; };
virtual INT SendText( LPSTR lpsStr) { return 0; };
virtual INT SendText( LPCSTR lpsStr) { return 0; };
protected:
SOCKET Socket;
SOCKADDR_IN SockAddrIn;
@@ -100,9 +100,9 @@ public:
CServerClientSocket() {};
CServerClientSocket(LPCServerSocket lpServerSocket);
CServerSocket *GetServerSocket();
virtual INT Transmit( LPSTR lpsBuffer, UINT nLength);
virtual INT Transmit( LPCSTR lpsBuffer, UINT nLength);
virtual INT Receive(LPSTR lpsBuffer, UINT nLength);
virtual INT SendText( LPSTR lpsText);
virtual INT SendText( LPCSTR lpsText);
virtual VOID MessageLoop();
virtual VOID OnRead() {};
//virtual VOID OnWrite() {};