Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 00:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dmitry Gorbachev

Browse source 
- Fix compiler warnings, treated as errors due to our settings, which are emitted when using GCC 4.3.2

See issue #3849 for more details.

svn path=/trunk/; revision=37465
This commit is contained in:
Colin Finck 2008-11-19 19:59:54 +00:00
parent 993a932cdf
commit 3bf81471d2
3 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
reactos/tools/cabman/cabinet.cxx
View file

@ -2055,9 +2055,19 @@ ULONG CCabinet::AddFile(char* FileName)
return CAB_STATUS_CANNOT_READ;
}
GetFileTimes(SrcFile, FileNode);
if (GetFileTimes(SrcFile, FileNode) != CAB_STATUS_SUCCESS)
{
DPRINT(MIN_TRACE, ("Cannot read file times.\n"));
FreeMemory(NewFileName);
return CAB_STATUS_CANNOT_READ;
}
GetAttributesOnFile(FileNode);
if (GetAttributesOnFile(FileNode) != CAB_STATUS_SUCCESS)
{
DPRINT(MIN_TRACE, ("Cannot read file attributes.\n"));
FreeMemory(NewFileName);
return CAB_STATUS_CANNOT_READ;
}
CloseFile(SrcFile);
@ -3646,7 +3656,8 @@ ULONG CCabinet::GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File)
strcpy(buf, File->FileName);
else
{
getcwd(buf, sizeof(buf));
if (!getcwd(buf, sizeof(buf)))
return CAB_STATUS_CANNOT_READ;
strcat(buf, DIR_SEPARATOR_STRING);
strcat(buf, File->FileName);
}
@ -3689,7 +3700,8 @@ ULONG CCabinet::GetAttributesOnFile(PCFFILE_NODE File)
strcpy(buf, File->FileName);
else
{
getcwd(buf, sizeof(buf));
if (!getcwd(buf, sizeof(buf)))
return CAB_STATUS_CANNOT_READ;
strcat(buf, DIR_SEPARATOR_STRING);
strcat(buf, File->FileName);
}

9
reactos/tools/cdmake/cdmake.c
View file

@ -882,7 +882,8 @@ make_directory_records (PDIR_RECORD d)
}
else
{
getcwd(buf, sizeof(buf));
if (!getcwd(buf, sizeof(buf)))
error_exit("Can't get CWD: %s\n", strerror(errno));
strcat(buf, DIR_SEPARATOR_STRING);
strcat(buf, source);
strcat(buf, entry->d_name);
@ -943,7 +944,8 @@ make_directory_records (PDIR_RECORD d)
}
else
{
getcwd(buf, sizeof(buf));
if (!getcwd(buf, sizeof(buf)))
error_exit("Can't get CWD: %s\n", strerror(errno));
strcat(buf, DIR_SEPARATOR_STRING);
strcat(buf, source);
}
@ -994,7 +996,8 @@ make_directory_records (PDIR_RECORD d)
}
else
{
getcwd(buf, sizeof(buf));
if (!getcwd(buf, sizeof(buf)))
error_exit("Can't get CWD: %s\n", strerror(errno));
strcat(buf, DIR_SEPARATOR_STRING);
strcat(buf, source);
strcat(buf, entry->d_name);

12
reactos/tools/rgenstat/rgenstat.c
View file

@ -553,7 +553,11 @@ process_directory (char *path, char *cvspath)
}
else
{
getcwd(buf, sizeof(buf));
if (!getcwd(buf, sizeof(buf)))
{
printf("Can't get CWD: %s\n", strerror(errno));
return;
}
strcat(buf, DIR_SEPARATOR_STRING);
strcat(buf, path);
strcat(buf, entry->d_name);
@ -611,7 +615,11 @@ process_directory (char *path, char *cvspath)
}
else
{
getcwd(buf, sizeof(buf));
if (!getcwd(buf, sizeof(buf)))
{
printf("Can't get CWD: %s\n", strerror(errno));
return;
}
strcat(buf, DIR_SEPARATOR_STRING);
strcat(buf, path);
strcat(buf, entry->d_name);