[cfinck] 32619: - It is enough to just add a "const" to fix the "deprecated conversion from string constant to 'char*'" warning. Remove the TempName variable from the previous cabman commit and pass the temp file directly again. - Add the same "const"'s to sysreg, so that it compiles with gcc >= 4.2 as well
Author: cfinck Date: Sun Mar 9 06:53:14 2008 New Revision: 32619
URL: http://svn.reactos.org/svn/reactos?rev=3D32619&view=3Drev Log: - It is enough to just add a "const" to fix the "deprecated conversion from= string constant to 'char*'" warning. Remove the TempName variable from the previous cabman commit and pass the= temp file directly again. - Add the same "const"'s to sysreg, so that it compiles with gcc >=3D 4.2 a= s well
Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/tools.rbuild
Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.= cxx?rev=3D32619&r1=3D32618&r2=3D32619&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 06:53:14 2008 @@ -1477,7 +1477,6 @@ */ { ULONG Status; - CHAR const TempName[9] =3D { '~', 'C', 'A', 'B', '.', 't', 'm', 'p', '0' = }; =
CurrentDiskNumber =3D 0; =
@@ -1529,7 +1528,7 @@ return CAB_STATUS_NOMEMORY; } =
- Status =3D ScratchFile->Create(TempName); + Status =3D ScratchFile->Create("~CAB.tmp"); =
CreateNewFolder =3D false; =
Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_suppo= rt.cpp?rev=3D32619&r1=3D32618&r2=3D32619&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/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Sun Mar 9 06:53:14 2008 @@ -122,7 +122,7 @@ return ret; } =
- OsSupport::ProcessID OsSupport::createProcess(char *procname, int procarg= snum, char **procargs, bool wait) + OsSupport::ProcessID OsSupport::createProcess(const char *procname, int p= rocargsnum, const char **procargs, bool wait) { STARTUPINFO siStartInfo; PROCESS_INFORMATION piProcInfo;
Modified: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_suppo= rt.h?rev=3D32619&r1=3D32618&r2=3D32619&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/sysreg/os_support.h (original) +++ trunk/reactos/tools/sysreg/os_support.h Sun Mar 9 06:53:14 2008 @@ -69,7 +69,7 @@ /// /// =
- static ProcessID createProcess(char * procname, int procargsnum, char **= procargs, bool wait); + static ProcessID createProcess(const char * procname, int procargsnum, c= onst char ** procargs, bool wait); =
//------------------------------------------------------------------------= --------------- ///
Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_= test.cpp?rev=3D32619&r1=3D32618&r2=3D32619&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/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Sun Mar 9 06:53:14 2008 @@ -85,7 +85,7 @@ bool RosBootTest::executeBootCmd() { int numargs =3D 0; - char * args[128]; + const char * args[128]; char * pBuf; char szBuffer[128]; =
@@ -191,25 +191,25 @@ } remove(image.c_str ()); =
- char * options[] =3D {NULL, - "create", - "-f", + const char * options[] =3D {NULL, + "create", + "-f", #ifdef __LINUX__ - "raw", + "raw", #else - "vmdk", -#endif - NULL, - "100M", - NULL - }; - - - options[0] =3D (char*)qemuimgdir.c_str(); - options[4] =3D (char*)image.c_str(); + "vmdk", +#endif + NULL, + "100M", + NULL + }; + + + options[0] =3D qemuimgdir.c_str(); + options[4] =3D image.c_str(); =
cerr << "Creating HDD Image ..." << image << endl; - OsSupport::createProcess ((char*)qemuimgdir.c_str(), 6, options, t= rue); + OsSupport::createProcess (qemuimgdir.c_str(), 6, options, true); if (isFileExisting(image)) { m_HDDImage =3D image;
Modified: trunk/reactos/tools/tools.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.rbuild?re= v=3D32619&r1=3D32618&r2=3D32619&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/tools.rbuild (original) +++ trunk/reactos/tools/tools.rbuild Sun Mar 9 06:53:14 2008 @@ -13,11 +13,9 @@ <directory name=3D"rgenstat"> <xi:include href=3D"rgenstat/rgenstat.rbuild" /> </directory> -<!-- <directory name=3D"sysreg"> <xi:include href=3D"sysreg/sysreg.rbuild" /> </directory> ---> <directory name=3D"unicode"> <xi:include href=3D"unicode/unicode.rbuild" /> </directory>
-
cfinck＠svn.reactos.org