mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-27 17:59:48 +02:00
Code Issues Projects Releases Wiki Activity

- bugfixes related to cppcheck report

Browse Source 
- bugfixes found using valgrind (memory leaks)
This commit is contained in:
Mark Vejvoda
2011-12-02 16:07:59 +00:00
parent 4885f3f3a6
commit d33e1174a5
59 changed files with 772 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/shared_lib/sources/feathery_ftp/ftpAccount.c
View File

@@ -119,13 +119,14 @@ int ftpCreateAccount(const char* name, const char* passw, const char* root, int
*/
int ftpFindAccount(const char* name)
{
int n;
if(name[0] != '\0')
for(n = 0; n < MAX_USERS; n++)
if(!strncmp(ftpUsers[n].name, name, MAXLEN_USERNAME))
if(name[0] != '\0') {
int n;
for(n = 0; n < MAX_USERS; n++) {
if(!strncmp(ftpUsers[n].name, name, MAXLEN_USERNAME)) {
return n + 1;
}
}
}
return 0;
}

8
source/shared_lib/sources/feathery_ftp/ftpCmds.c
View File

@@ -276,7 +276,6 @@ LOCAL int ftpCmdAbor(int sessionId, const char* args, int len)
#define MLSD 8
LOCAL int sendListing(socket_t dataSocket, int sessionId, const char* path, int format)
{
int haveAnySuccessfulFiles = 0;
void *dir;
const char monName[12][4] = {
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
@@ -286,11 +285,12 @@ LOCAL int sendListing(socket_t dataSocket, int sessionId, const char* path, int
dir = ftpOpenDir(path);
if(dir)
{
const char* dirEntry;
int len;
const char* dirEntry = NULL;
int len = 0;
int err = 0;
ftpTime_S currTime = {0};
ftpPathInfo_S fileInfo;
int haveAnySuccessfulFiles = 0;
ftpGetLocalTime(&currTime);
ftpSendMsg(MSG_NORMAL, sessionId, 150, ftpMsg010);
@@ -1023,7 +1023,6 @@ void ftpParseCmd(int sessionId)
{
ftpSession_S *pSession;
int len;
int c;
socket_t ctrlSocket;
pSession = ftpGetSession(sessionId);
@@ -1033,6 +1032,7 @@ void ftpParseCmd(int sessionId)
if((pSession->rxBuf[len - 1] == '\n') &&
(pSession->rxBuf[len - 2] == '\r') ) // command correctly terminated?
{
int c = 0;
pSession->rxBuf[len - 2] = '\0';
pSession->rxBufWriteIdx = 0;

4
source/shared_lib/sources/feathery_ftp/ftpTargetWin32.c
View File

@@ -548,8 +548,8 @@ int getLastSocketError() {
const char * getLastSocketErrorText(int *errNumber) {
int errId = (errNumber != NULL ? *errNumber : getLastSocketError());
//return WSAGetLastErrorMessage("",errId);
return "?";
return WSAGetLastErrorMessage("",errId);
//return "?";
}
#endif