Author: cwittich
Date: Sun Mar 9 11:41:55 2008
New Revision: 32616
URL:
http://svn.reactos.org/svn/reactos?rev=3D32616&view=3Drev
Log:
fix cabman build with gcc >=3D 4.2
Modified:
trunk/reactos/tools/cabman/cabinet.cxx
trunk/reactos/tools/cabman/cabinet.h
Modified: trunk/reactos/tools/cabman/cabinet.cxx
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.=
cxx?rev=3D32616&r1=3D32615&r2=3D32616&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/tools/cabman/cabinet.cxx (original)
+++ trunk/reactos/tools/cabman/cabinet.cxx Sun Mar 9 11:41:55 2008
@@ -116,7 +116,7 @@
}
=
=
-ULONG CCFDATAStorage::Create(char* FileName)
+ULONG CCFDATAStorage::Create(const char* FileName)
/*
* FUNCTION: Creates the file
* ARGUMENTS:
@@ -1477,6 +1477,7 @@
*/
{
ULONG Status;
+ CHAR const TempName[9] =3D { '~', 'C', 'A', 'B',
'.', 't', 'm', 'p', '0' =
};
=
CurrentDiskNumber =3D 0;
=
@@ -1528,7 +1529,7 @@
return CAB_STATUS_NOMEMORY;
}
=
- Status =3D ScratchFile->Create("~CAB.tmp");
+ Status =3D ScratchFile->Create(TempName);
=
CreateNewFolder =3D false;
=
Modified: trunk/reactos/tools/cabman/cabinet.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.=
h?rev=3D32616&r1=3D32615&r2=3D32616&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/tools/cabman/cabinet.h (original)
+++ trunk/reactos/tools/cabman/cabinet.h Sun Mar 9 11:41:55 2008
@@ -296,7 +296,7 @@
CCFDATAStorage();
/* Default destructor */
virtual ~CCFDATAStorage();
- ULONG Create(char* FileName);
+ ULONG Create(const char* FileName);
ULONG Destroy();
ULONG Truncate();
ULONG Position();