xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove dead code for nonstandard printf format used by old microsoft compilers 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8857 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
iobyte 2023-03-31 01:43:28 +00:00
parent 6f5b30ef2a
commit 1ce29577ca
17 changed files with 14 additions and 363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/shadow/src/Path.cpp
View File

@ -1421,11 +1421,7 @@ bool Path::SavePath( const char* pDataFile ) const
fprintf( pFile, "%g\n", m_pTrack->GetLength() );
fprintf( pFile, "BEGIN-POINTS\n" );
#if defined(_MSC_VER) && _MSC_VER < 1800
fprintf( pFile, "%Iu\n", m_pts.size() );
#else
fprintf( pFile, "%zu\n", m_pts.size() );
#endif
for( size_t i = 0; i < m_pts.size(); i++ )
{
fprintf( pFile, "%.20g\n", m_pts[i].offs );

4
src/drivers/shadow/src/PathOffsets.cpp
View File

@ -110,11 +110,7 @@ void PathOffsets::save_springs( const MyTrack& track, int lap )
fprintf( pFile, "%g\n", track.GetLength() );
fprintf( pFile, "BEGIN-POINTS\n" );
#if defined(_MSC_VER) && _MSC_VER < 1800
fprintf( pFile, "%Iu\n", _offsets.size() );
#else
fprintf( pFile, "%zu\n", _offsets.size() );
#endif
for( size_t i = 0; i < _offsets.size(); i++ )
{
fprintf( pFile, "%.20g %g\n", _offsets[i], _times[i] );

16
src/drivers/shadow/src/Stuck.cpp
View File

@ -902,11 +902,7 @@ void Stuck::fillTrackCells( const MyTrack& track )
bool Stuck::solve( const tCarElt* me )
{
#if defined(_MSC_VER) && _MSC_VER < 1800
LogSHADOW.debug( "[%d] stuck::solve (exp=%d, qlen=%Iu, best time=%g)\n", me->index, _expansionsN, _pqN.size(), _bestTime );
#else
LogSHADOW.debug( "[%d] stuck::solve (exp=%d, qlen=%zu, best time=%g)\n", me->index, _expansionsN, _pqN.size(), _bestTime );
#endif
vector<GridPoint> succs;
GridPoint car_pt1(*this, me, true, 0);
@ -1001,11 +997,7 @@ bool Stuck::solve( const tCarElt* me )
// search from car to destination.
bool Stuck::solveR( const tCarElt* me )
{
#if defined(_MSC_VER) && _MSC_VER < 1800
LogSHADOW.debug( "[%d] stuck::solveR (exp=%d, qlen=%Iu, best time=%g)\n", me->index, _expansionsR, _pqR.size(), _bestTime );
#else
LogSHADOW.debug( "[%d] stuck::solveR (exp=%d, qlen=%zu, best time=%g)\n", me->index, _expansionsR, _pqR.size(), _bestTime );
#endif
vector<GridPoint> succs;
@ -1209,11 +1201,7 @@ void Stuck::getUnstuck( const MyTrack& track, tCarElt* me, const tSituation* s )
{
const GridPoint& pt = _plan[i];
double dist = pt.dist(car_pt1);
#if defined(_MSC_VER) && _MSC_VER < 1800
LogSHADOW.debug( "[%Iu]=%g, ", i, dist );
#else
LogSHADOW.debug( "[%zu]=%g, ", i, dist );
#endif
if( bestDist > dist )
{
bestDist = dist;
@ -1271,11 +1259,7 @@ void Stuck::getUnstuck( const MyTrack& track, tCarElt* me, const tSituation* s )
}
}
#if defined(_MSC_VER) && _MSC_VER < 1800
LogSHADOW.debug( "[%d] plan index: %d/%Iu acc=%.3f, gear=%d, da=%.3f, steer=%.3f, dist-ahead=%.3f\n",
#else
LogSHADOW.debug( "[%d] plan index: %d/%zu acc=%.3f, gear=%d, da=%.3f, steer=%.3f, dist-ahead=%.3f\n",
#endif
me->index, _planIndex, _plan.size(), me->ctrl.accelCmd, me->ctrl.gear, deltaAng * 180 / PI,
me->ctrl.steer * me->info.steerLock * 180 / PI, dist );
}

4
src/drivers/simplix/src/unitclothoid.cpp
View File

@ -803,11 +803,7 @@ void TClothoidLane::SavePointsToFile(const char* TrackLoad)
if( writeSize < 1)
error = true;
#if defined(_MSC_VER) && _MSC_VER < 1800
LogSimplix.debug("\n\n\nsizeof(TPathPt): %Iu\n\n\n",sizeof(TPathPt));
#else
LogSimplix.debug("\n\n\nsizeof(TPathPt): %zu\n\n\n",sizeof(TPathPt));
#endif
void* Start = &(oPathPoints[0]);
void* End = &(oPathPoints[0].MaxSpeed);
int UsedLen = ((char *) End) - ((char *) Start);

4
src/libs/tgf/application.cpp
View File

@ -324,11 +324,7 @@ bool GfApplication::parseOptions()
GfInitInstallDir(_lstArgs.front().c_str());
// Parse args, looking for registered options.
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogInfo("Parsing command line args (%Iu)\n", _lstArgs.size() - 1);
#else
GfLogInfo("Parsing command line args (%zu)\n", _lstArgs.size() - 1);
#endif
std::list<std::string>::const_iterator itArg = _lstArgs.begin();
for (++itArg; itArg != _lstArgs.end(); ++itArg)
{

4
src/libs/tgf/eventloop.cpp
View File

@ -99,11 +99,7 @@ int GfEventLoop::Private::translateKeySym(int code, int modifier, int unicode)
// Truncate unicodes above GF_MAX_KEYCODE (no need for more).
keyUnicode = (unsigned short)(unicode & GF_MAX_KEYCODE);
_mapUnicodes[keyId] = (unsigned short)keyUnicode;
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogDebug("translateKeySym(c=%X, m=%X, u=%X) : '%c', id=%X, ucode=%X (nk=%Iu)\n",
#else
GfLogDebug("translateKeySym(c=%X, m=%X, u=%X) : '%c', id=%X, ucode=%X (nk=%zu)\n",
#endif
code, modifier, unicode, // Truncate high bits for MSVC 2010 bugs.
(keyUnicode > 0 && keyUnicode < 128 && isprint(keyUnicode & 0x7F))
? (char)(keyUnicode & 0x7F) : ' ',

47
src/libs/tgf/params.cpp
View File

@ -203,11 +203,7 @@ getFullName (const char *sectionName, const char *paramName)
fullName = (char *) malloc (strlen (sectionName) + strlen (paramName) + 2);
if (!fullName) {
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError ("getFullName: malloc (%03Iu) failed", strlen (sectionName) + strlen (paramName) + 2);
#else //_MSC_VER
GfLogError ("getFullName: malloc (%zu) failed", strlen (sectionName) + strlen (paramName) + 2);
#endif //_MSC_VER
return NULL;
}
sprintf (fullName, "%s/%s", sectionName, paramName);
@ -335,11 +331,7 @@ addParam (struct parmHeader *conf, struct section *section, const char *paramNam
param = (struct param *) calloc (1, sizeof (struct param));
if (!param) {
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError ("addParam: calloc (1, %03Iu) failed\n", sizeof (struct param));
#else //_MSC_VER
GfLogError ("addParam: calloc (1, %zu) failed\n", sizeof (struct param));
#endif //_MSC_VER
goto bailout;
}
@ -459,11 +451,7 @@ addSection (struct parmHeader *conf, const char *sectionName)
section = (struct section *) calloc (1, sizeof (struct section));
if (!section) {
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError ("addSection: calloc (1, 03Iu) failed\n", sizeof (struct section));
#else //_MSC_VER
GfLogError ("addSection: calloc (1, %zu) failed\n", sizeof (struct section));
#endif //_MSC_VER
return NULL;
}
@ -529,11 +517,7 @@ createParmHeader (const char *file)
conf = (struct parmHeader *) calloc (1, sizeof (struct parmHeader));
if (!conf) {
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError ("createParmHeader: calloc (1, %03Iu) failed\n", sizeof (struct parmHeader));
#else //_MSC_VER
GfLogError ("createParmHeader: calloc (1, %zu) failed\n", sizeof (struct parmHeader));
#endif //_MSC_VER
return NULL;
}
@ -541,11 +525,7 @@ createParmHeader (const char *file)
conf->rootSection = (struct section *) calloc (1, sizeof (struct section));
if (!conf->rootSection) {
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError ("createParmHeader: calloc (1, %03Iu) failed\n", sizeof (struct section));
#else //_MSC_VER
GfLogError ("createParmHeader: calloc (1, %zu) failed\n", sizeof (struct section));
#endif //_MSC_VER
goto bailout;
}
GF_TAILQ_INIT (&(conf->rootSection->paramList));
@ -1213,11 +1193,7 @@ GfParmReadBuf (char *buffer)
/* Handle creation */
parmHandle = (struct parmHandle *) calloc (1, sizeof (struct parmHandle));
if (!parmHandle) {
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError ("GfParmReadBuf: calloc (1, %03Iu) failed\n", sizeof (struct parmHandle));
#else //_MSC_VER
GfLogError ("GfParmReadBuf: calloc (1, %zu) failed\n", sizeof (struct parmHandle));
#endif //_MSC_VER
goto bailout;
}
@ -1318,17 +1294,10 @@ GfParmReadFile (const char *file, int mode, bool neededFile, bool trace)
/* Handle creation */
parmHandle = (struct parmHandle *) calloc (1, sizeof (struct parmHandle));
if (!parmHandle) {
#if defined(_MSC_VER) && _MSC_VER < 1800
if (TraceLoggersAvailable)
GfLogError ("GfParmReadFile: calloc (1, %03Iu) failed\n", sizeof (struct parmHandle));
else
fprintf(stderr,"GfParmReadFile: calloc (1, %03Iu) failed\n", sizeof (struct parmHandle));
#else //_MSC_VER
if (TraceLoggersAvailable)
GfLogError ("GfParmReadFile: calloc (1, %zu) failed\n", sizeof (struct parmHandle));
else
fprintf(stderr,"GfParmReadFile: calloc (1, %zu) failed\n", sizeof (struct parmHandle));
#endif //_MSC_VER
goto bailout;
}
@ -2600,11 +2569,7 @@ GfParmListRemoveElt (void *handle, const char *path, const char *key)
}
fullName = (char *) malloc (strlen (path) + strlen (key) + 2);
if (!fullName) {
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError ("GfParmListRemoveElt: malloc (%lu) failed\n", strlen (path) + strlen (key) + 2);
#else
GfLogError ("GfParmListRemoveElt: malloc (%zu) failed\n", strlen (path) + strlen (key) + 2);
#endif
return -1;
}
sprintf (fullName, "%s/%s", path, key);
@ -2648,11 +2613,7 @@ GfParmListRenameElt (void *handle, const char *path, const char *oldKey, const c
// Build new element full name.
newFullName = (char *) malloc (strlen (path) + strlen (newKey) + 2);
if (!newFullName) {
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError ("GfParmListRenameElt: malloc (%lu) failed\n", strlen (path) + strlen (newKey) + 2);
#else
GfLogError ("GfParmListRenameElt: malloc (%zu) failed\n", strlen (path) + strlen (newKey) + 2);
#endif
return -1;
}
sprintf (newFullName, "%s/%s", path, newKey);
@ -2667,11 +2628,7 @@ GfParmListRenameElt (void *handle, const char *path, const char *oldKey, const c
// Check if no other element has same fullname in the list.
oldFullName = (char *) malloc (strlen (path) + strlen (oldKey) + 2);
if (!oldFullName) {
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError ("GfParmListRenameElt: malloc (%lu) failed", strlen (path) + strlen (oldKey) + 2);
#else
GfLogError ("GfParmListRenameElt: malloc (%zu) failed", strlen (path) + strlen (oldKey) + 2);
#endif
return -1;
}
sprintf (oldFullName, "%s/%s", path, oldKey);
@ -4626,11 +4583,7 @@ GfParmMergeHandles(void *ref, void *tgt, int mode)
/* Handle creation */
parmHandleOut = (struct parmHandle *) calloc (1, sizeof (struct parmHandle));
if (!parmHandleOut) {
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError ("GfParmMergeHandles: calloc (1, %03Iu) failed\n", sizeof (struct parmHandle));
#else //_MSC_VER
GfLogError ("GfParmMergeHandles: calloc (1, %zu) failed\n", sizeof (struct parmHandle));
#endif //_MSC_VER
parmReleaseHeader (confOut);
return NULL;
}

4
src/libs/tgfdata/cars.cpp
View File

@ -240,11 +240,7 @@ std::vector<std::string> GfCars::getCarNamesInCategory(const std::string& strCat
void GfCars::print() const
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("Car base : %Iu categories, %Iu cars\n",
#else
GfLogTrace("Car base : %zu categories, %zu cars\n",
#endif
_pPrivate->vecCatIds.size(), _pPrivate->vecCars.size());
std::vector<std::string>::const_iterator itCatName;
for (itCatName = _pPrivate->vecCatNames.begin();

4
src/libs/tgfdata/drivers.cpp
View File

@ -261,11 +261,7 @@ std::vector<GfDriver*> GfDrivers::getDriversWithTypeAndCategory(const std::strin
void GfDrivers::print() const
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("Driver base : %Iu types, %Iu car categories, %Iu drivers\n",
#else
GfLogTrace("Driver base : %zu types, %zu car categories, %zu drivers\n",
#endif
_pPrivate->vecTypes.size(), _pPrivate->vecCarCategoryIds.size(),
_pPrivate->vecDrivers.size());

4
src/libs/tgfdata/racemanagers.cpp
View File

@ -195,11 +195,7 @@ std::vector<GfRaceManager*> GfRaceManagers::getRaceManagersWithType(const std::s
void GfRaceManagers::print(bool bVerbose) const
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("Race managers : %Iu types, %Iu race managers\n",
#else
GfLogTrace("Race managers : %zu types, %zu race managers\n",
#endif
_pPrivate->vecTypes.size(), _pPrivate->vecRaceMans.size());
std::vector<std::string>::const_iterator itType;
for (itType = _pPrivate->vecTypes.begin();

4
src/libs/tgfdata/tracks.cpp
View File

@ -429,11 +429,7 @@ GfTrack* GfTracks::getFirstUsableTrack(const std::string& strFromCatId,
void GfTracks::print(bool bVerbose) const
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("Track base : %Iu categories, %Iu tracks\n",
#else
GfLogTrace("Track base : %zu categories, %zu tracks\n",
#endif
_pPrivate->vecCatIds.size(), _pPrivate->vecTracks.size());
std::vector<std::string>::const_iterator itCatId;
for (itCatId = _pPrivate->vecCatIds.begin(); itCatId != _pPrivate->vecCatIds.end(); ++itCatId)

58
src/modules/networking/client.cpp
View File

@ -276,11 +276,7 @@ void NetClient::SetDriverReady(bool bReady)
{
GfLogFatal("SetDriverReady: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SetDriverReady: packed data length=%Iu\n", msg.length());
#else
GfLogTrace("SetDriverReady: packed data length=%zu\n", msg.length());
#endif
ENetPacket *pPacket = enet_packet_create (msg.buffer(),
msg.length(),
@ -340,12 +336,7 @@ bool NetClient::SendDriverInfoPacket(NetDriver *pDriver)
{
GfLogFatal("SendDriverInfoPacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendDriverInfoPacket: packed data length=%Iu\n",
#else
GfLogTrace("SendDriverInfoPacket: packed data length=%zu\n",
#endif
msg.length());
GfLogTrace("SendDriverInfoPacket: packed data length=%zu\n", msg.length());
ENetPacket * pPacket = enet_packet_create (msg.buffer(),
msg.length(),
@ -374,12 +365,7 @@ void NetClient::SendReadyToStartPacket()
{
GfLogFatal("SendReadyToStartPacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendReadyToStartPacket: packed data length=%Iu\n",
#else
GfLogTrace("SendReadyToStartPacket: packed data length=%zu\n",
#endif
msg.length());
GfLogTrace("SendReadyToStartPacket: packed data length=%zu\n", msg.length());
ENetPacket *pPacket = enet_packet_create (msg.buffer(),
msg.length(),
@ -404,12 +390,7 @@ void NetClient::SendServerTimeRequest()
{
GfLogFatal("SendServerTimeRequest: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendServerTimeRequest: packed data length=%Iu\n",
#else
GfLogTrace("SendServerTimeRequest: packed data length=%zu\n",
#endif
msg.length());
GfLogTrace("SendServerTimeRequest: packed data length=%zu\n", msg.length());
ENetPacket *pPacket = enet_packet_create (msg.buffer(),
@ -437,12 +418,7 @@ void NetClient::ReadStartTimePacket(ENetPacket *pPacket)
//double time = GfTimeClock();
PackedBuffer msg(pPacket->data, pPacket->dataLength);
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("ReadStartTimePacket: packed data length=%Iu\n",
#else
GfLogTrace("ReadStartTimePacket: packed data length=%zu\n",
#endif
msg.length());
GfLogTrace("ReadStartTimePacket: packed data length=%zu\n", msg.length());
try
{
@ -590,11 +566,7 @@ void NetClient::ReadPacket(ENetEvent event)
break;
default:
assert(false);
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogDebug ("A packet of length %Iu containing %s was received from %s on channel %d.\n",
#else
GfLogDebug ("A packet of length %zu containing %s was received from %s on channel %d.\n",
#endif
event.packet -> dataLength,
event.packet -> data,
(char*)event.peer -> data,
@ -692,11 +664,7 @@ void NetClient::ReadAllDriverReadyPacket(ENetPacket *pPacket)
int rsize;
PackedBuffer msg(pPacket->data, pPacket->dataLength);
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("ReadAllDriverReadyPacket: packed data length=%Iu\n",
#else
GfLogTrace("ReadAllDriverReadyPacket: packed data length=%zu\n",
#endif
msg.length());
try
@ -724,11 +692,7 @@ void NetClient::ReadAllDriverReadyPacket(ENetPacket *pPacket)
void NetClient::ReadFinishTimePacket(ENetPacket *pPacket)
{
PackedBuffer msg(pPacket->data, pPacket->dataLength);
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("ReadFinishTimePacket: packed data length=%Iu\n",
#else
GfLogTrace("ReadFinishTimePacket: packed data length=%zu\n",
#endif
msg.length());
try
@ -756,12 +720,7 @@ void NetClient::ReadTimePacket(ENetPacket *pPacket)
double time = 0;
PackedBuffer msg(pPacket->data, pPacket->dataLength);
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("ReadTimePacket: packed data length=%Iu\n",
#else
GfLogTrace("ReadTimePacket: packed data length=%zu\n",
#endif
msg.length());
GfLogTrace("ReadTimePacket: packed data length=%zu\n", msg.length());
try
{
@ -787,12 +746,7 @@ void NetClient::ReadFilePacket(ENetPacket *pPacket)
memset(file, 0, sizeof file);
PackedBuffer msg(pPacket->data, pPacket->dataLength);
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("ReadFilePacket: packed data length=%Iu\n",
#else
GfLogTrace("ReadFilePacket: packed data length=%zu\n",
#endif
msg.length());
GfLogTrace("ReadFilePacket: packed data length=%zu\n", msg.length());
try
{

33
src/modules/networking/network.cpp
View File

@ -449,11 +449,7 @@ void NetNetwork::SendLapStatusPacket(tCarElt *pCar)
GfLogFatal("SendLapStatusPacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendLapStatusPacket: packed data length=%Iu\n", msg.length());
#else
GfLogTrace("SendLapStatusPacket: packed data length=%zu\n", msg.length());
#endif
ENetPacket *pPacket = enet_packet_create (msg.buffer(),
msg.length(),
@ -525,11 +521,7 @@ void NetNetwork::SendCarStatusPacket(tSituation *s,bool bForce)
GfLogFatal("SendCarStatusPacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendCarStatusPacket: packed data length=%Iu\n", msg.length());
#else
GfLogTrace("SendCarStatusPacket: packed data length=%zu\n", msg.length());
#endif
ENetPacket * pPacket = enet_packet_create (msg.buffer(),
msg.length(),
@ -620,11 +612,7 @@ void NetNetwork::SendCarControlsPacket(tSituation *s)
{
GfLogFatal("SendCarControlsPacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendCarControlsPacket: packed data length=%Iu\n",
#else
GfLogTrace("SendCarControlsPacket: packed data length=%zu\n",
#endif
msg.length());
ENetPacket * pPacket = enet_packet_create (msg.buffer(),
@ -637,12 +625,7 @@ void NetNetwork::SendCarControlsPacket(tSituation *s)
void NetNetwork::ReadLapStatusPacket(ENetPacket *pPacket)
{
PackedBuffer msg(pPacket->data, pPacket->dataLength);
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("ReadLapStatusPacket: packed data length=%Iu\n",
#else
GfLogTrace("ReadLapStatusPacket: packed data length=%zu\n",
#endif
msg.length());
GfLogTrace("ReadLapStatusPacket: packed data length=%zu\n", msg.length());
LapStatus lstatus;
lstatus.startRank = 0; // Avoid compiler warnings
@ -681,12 +664,7 @@ void NetNetwork::ReadLapStatusPacket(ENetPacket *pPacket)
void NetNetwork::ReadCarStatusPacket(ENetPacket *pPacket)
{
PackedBuffer msg(pPacket->data, pPacket->dataLength);
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("ReadCarStatusPacket: packed data length=%Iu\n",
#else
GfLogTrace("ReadCarStatusPacket: packed data length=%zu\n",
#endif
msg.length());
GfLogTrace("ReadCarStatusPacket: packed data length=%zu\n", msg.length());
double packettime;
int iNumCars;
@ -760,12 +738,7 @@ void NetNetwork::GetHostSettings(std::string &strCarCat,bool &bCollisions)
void NetNetwork::ReadCarControlsPacket(ENetPacket *pPacket)
{
PackedBuffer msg(pPacket->data, pPacket->dataLength);
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("ReadCarControlsPacket: packed data length=%Iu\n",
#else
GfLogTrace("ReadCarControlsPacket: packed data length=%zu\n",
#endif
msg.length());
GfLogTrace("ReadCarControlsPacket: packed data length=%zu\n", msg.length());
double packettime;
int iNumCars;

80
src/modules/networking/pack.cpp
View File

@ -101,11 +101,7 @@ void PackedBuffer::pack_ubyte(unsigned char v)
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("pack_ubyte: buffer overflow: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("pack_ubyte: buffer overflow: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -122,11 +118,7 @@ void PackedBuffer::pack_short(short v)
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("pack_short: buffer overflow: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("pack_short: buffer overflow: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -143,11 +135,7 @@ void PackedBuffer::pack_int(int v)
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("pack_int: buffer overflow: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("pack_int: buffer overflow: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -164,11 +152,7 @@ void PackedBuffer::pack_ushort(unsigned short v)
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("pack_ushort: buffer overflow: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("pack_ushort: buffer overflow: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -185,11 +169,7 @@ void PackedBuffer::pack_uint(unsigned int v)
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("pack_uint: buffer overflow: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("pack_uint: buffer overflow: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -207,11 +187,7 @@ void PackedBuffer::pack_float(float v)
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("pack_float: buffer overflow: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("pack_float: buffer overflow: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -236,11 +212,7 @@ void PackedBuffer::pack_double(double v) { const size_t size = sizeof(Uint64);
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("pack_double: buffer overflow: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("pack_double: buffer overflow: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -271,11 +243,7 @@ void PackedBuffer::pack_vector(const float *v)
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("pack_vector: buffer overflow: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("pack_vector: buffer overflow: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -301,11 +269,7 @@ void PackedBuffer::pack_string(const void *m, int len)
{
if (bounds_error(len))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("pack_string: buffer overflow: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("pack_string: buffer overflow: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -324,11 +288,7 @@ void PackedBuffer::pack_stdstring(const std::string& str)
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("pack_stdstring: buffer overflow: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("pack_stdstring: buffer overflow: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -343,11 +303,7 @@ unsigned char PackedBuffer::unpack_ubyte()
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("unpack_ubyte: buffer overrun: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("unpack_ubyte: buffer overrun: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -366,11 +322,7 @@ short PackedBuffer::unpack_short()
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("unpack_short: buffer overrun: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("unpack_short: buffer overrun: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -389,11 +341,7 @@ int PackedBuffer::unpack_int()
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("unpack_int: buffer overrun: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("unpack_int: buffer overrun: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -412,11 +360,7 @@ unsigned short PackedBuffer::unpack_ushort()
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("unpack_ushort: buffer overrun: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("unpack_ushort: buffer overrun: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -435,11 +379,7 @@ unsigned int PackedBuffer::unpack_uint()
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("unpack_uint: buffer overrun: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("unpack_uint: buffer overrun: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -458,11 +398,7 @@ float PackedBuffer::unpack_float()
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("unpack_float: buffer overrun: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("unpack_float: buffer overrun: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -487,11 +423,7 @@ double PackedBuffer::unpack_double()
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("unpack_double: buffer overrun: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("unpack_double: buffer overrun: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -513,11 +445,7 @@ float *PackedBuffer::unpack_vector(float *v)
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("unpack_vector: buffer overrun: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("unpack_vector: buffer overrun: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -542,11 +470,7 @@ void *PackedBuffer::unpack_string(void *m, int len)
{
if (bounds_error(len))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("unpack_string: buffer overrun: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("unpack_string: buffer overrun: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}
@ -563,11 +487,7 @@ std::string &PackedBuffer::unpack_stdstring(std::string& str)
if (bounds_error(size))
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("unpack_stdstring: packed overrun: buf_size=%Iu data_length=%Iu\n",
#else
GfLogError("unpack_stdstring: packed overrun: buf_size=%zu data_length=%zu\n",
#endif
buf_size, data_length);
throw PackedBufferException();
}

83
src/modules/networking/server.cpp
View File

@ -195,11 +195,7 @@ void NetServer::SendStartTimePacket(int &startTime)
GfLogFatal("SendStartTimePacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendStartTimePacket: packed data length=%Iu\n", msg.length());
#else
GfLogTrace("SendStartTimePacket: packed data length=%zu\n", msg.length());
#endif
ENetPacket * pPacket = enet_packet_create (msg.buffer(),
msg.length(),
@ -303,11 +299,7 @@ void NetServer::SetLocalDrivers()
{
if(pSData->m_vecNetworkPlayers[i].client == false) {
m_setLocalDrivers.insert(i);
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("Adding Human start rank: %Iu\n",i);
#else
GfLogTrace("Adding Human start rank: %zu\n",i);
#endif
}
}
UnlockServerData();
@ -515,12 +507,7 @@ bool NetServer::SendPlayerAcceptedPacket(ENetPeer * pPeer)
{
GfLogFatal("SendPlayerAcceptedPacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendPlayerAcceptedPacket: packed data length=%Iu\n",
#else
GfLogTrace("SendPlayerAcceptedPacket: packed data length=%zu\n",
#endif
msg.length());
GfLogTrace("SendPlayerAcceptedPacket: packed data length=%zu\n", msg.length());
ENetPacket * pPacket = enet_packet_create (msg.buffer(),
msg.length(),
@ -548,11 +535,7 @@ bool NetServer::SendPlayerRejectedPacket(ENetPeer * pPeer, const std::string &st
GfLogFatal("SendPlayerRejectedPacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendPlayerRejectedPacket: packed data length=%Iu\n", msg.length());
#else
GfLogTrace("SendPlayerRejectedPacket: packed data length=%zu\n", msg.length());
#endif
ENetPacket * pPacket = enet_packet_create (msg.buffer(),
msg.length(),
@ -587,11 +570,7 @@ void NetServer::SendDriversReadyPacket()
GfLogFatal("SendDriversReadyPacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendDriversReadyPacket: packed data length=%Iu\n", msg.length());
#else
GfLogTrace("SendDriversReadyPacket: packed data length=%zu\n", msg.length());
#endif
UnlockNetworkData();
@ -616,11 +595,7 @@ void NetServer::SendRaceSetupPacket()
GfLogFatal("SendRaceSetupPacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendRaceSetupPacket: packed data length=%Iu\n", msg.length());
#else
GfLogTrace("SendRaceSetupPacket: packed data length=%zu\n", msg.length());
#endif
ENetPacket * pPacket = enet_packet_create (msg.buffer(),
msg.length(),
@ -639,12 +614,7 @@ void NetServer::ReadDriverReadyPacket(ENetPacket *pPacket)
bool bReady;
PackedBuffer msg(pPacket->data, pPacket->dataLength);
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("ReadDriverReadyPacket: packed data length=%Iu\n",
#else
GfLogTrace("ReadDriverReadyPacket: packed data length=%zu\n",
#endif
msg.length());
GfLogTrace("ReadDriverReadyPacket: packed data length=%zu\n", msg.length());
try
{
@ -677,12 +647,7 @@ void NetServer::ReadDriverInfoPacket(ENetPacket *pPacket, ENetPeer * pPeer)
GfLogTrace ("Client Player Info connected from %s\n",hostName);
PackedBuffer msg(pPacket->data, pPacket->dataLength);
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("ReadDriverInfoPacket: packed data length=%Iu\n",
#else
GfLogTrace("ReadDriverInfoPacket: packed data length=%zu\n",
#endif
msg.length());
GfLogTrace("ReadDriverInfoPacket: packed data length=%zu\n", msg.length());
try
{
@ -790,11 +755,7 @@ void NetServer::SendWeatherPacket()
GfLogFatal("SendWeatherPacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendWeatherPacket: packed data length=%Iu\n", msg.length());
#else
GfLogTrace("SendWeatherPacket: packed data length=%zu\n", msg.length());
#endif
ENetPacket *pWeatherPacket = enet_packet_create(msg.buffer(),
msg.length(),
@ -823,11 +784,7 @@ void NetServer::SendTimePacket(ENetPacket *pPacketRec, ENetPeer * pPeer)
GfLogFatal("SendTimePacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendTimePacket: packed data length=%Iu\n", msg.length());
#else
GfLogTrace("SendTimePacket: packed data length=%zu\n", msg.length());
#endif
//TODO change to peer send
ENetPacket * pPacket = enet_packet_create (msg.buffer(),
@ -892,11 +849,7 @@ void NetServer::SendFilePacket(const char *pszFile)
GfLogFatal("SendFilePacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendFilePacket: packed data length=%Iu\n", msg.length());
#else
GfLogTrace("SendFilePacket: packed data length=%zu\n", msg.length());
#endif
ENetPacket * pPacket = enet_packet_create (msg.buffer(),
msg.length(),
@ -1008,11 +961,7 @@ void NetServer::RemovePlayerFromRace(unsigned int idx)
GfLogFatal("RemovePlayerFromRace: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("RemovePlayerFromRace: packed data length=%Iu\n", msg.length());
#else
GfLogTrace("RemovePlayerFromRace: packed data length=%zu\n", msg.length());
#endif
ENetPacket * pPacket = enet_packet_create (msg.buffer(),
msg.length(),
@ -1041,12 +990,7 @@ void NetServer::ReadPacket(ENetEvent event)
memset(&name[0],0,256);
PackedBuffer msg(pPacket->data, pPacket->dataLength);
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("ReadPacket: packed data length=%Iu\n",
#else
GfLogTrace("ReadPacket: packed data length=%zu\n",
#endif
msg.length());
GfLogTrace("ReadPacket: packed data length=%zu\n", msg.length());
try
{
@ -1095,11 +1039,7 @@ void NetServer::ReadPacket(ENetEvent event)
break;
default:
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace ("A packet of length %Iu containing %s was received from %s on channel %d.\n",
#else
GfLogTrace ("A packet of length %zu containing %s was received from %s on channel %d.\n",
#endif
event.packet -> dataLength,
event.packet -> data,
(char*)event.peer -> data,
@ -1131,11 +1071,7 @@ void NetServer::SendFinishTimePacket()
GfLogFatal("SendFinishTimePacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendFinishTimePacket: packed data length=%Iu\n", msg.length());
#else
GfLogTrace("SendFinishTimePacket: packed data length=%zu\n", msg.length());
#endif
ENetPacket * pPacket = enet_packet_create (msg.buffer(),
msg.length(),
@ -1172,12 +1108,7 @@ void NetServer::SendPrepareToRacePacket()
{
GfLogFatal("SendPrepareToRacePacket: packed buffer error\n");
}
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogTrace("SendPrepareToRacePacket: packed data length=%Iu\n",
#else
GfLogTrace("SendPrepareToRacePacket: packed data length=%zu\n",
#endif
msg.length());
GfLogTrace("SendPrepareToRacePacket: packed data length=%zu\n", msg.length());
ENetPacket * pPacket = enet_packet_create (msg.buffer(),
msg.length(),
@ -1223,11 +1154,7 @@ void NetServer::Dump(const char* pszCaller)
NetMutexData *pNData = LockNetworkData();
NetServerMutexData *pSData = LockServerData();
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogDebug("%s : vecReady:%Iu, vecPlayers:%Iu\n",
#else
GfLogDebug("%s : vecReady:%zu, vecPlayers:%zu\n",
#endif
pszCaller, pNData->m_vecReadyStatus.size(), pSData->m_vecNetworkPlayers.size());
UnlockServerData();

20
src/modules/userinterface/legacymenu/racescreens/carsetupmenu.cpp
View File

@ -372,11 +372,7 @@ void CarSetupMenu::loadSettings()
{
std::string strSection = sections[i];
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogDebug("section %Iu: %s\n", i, strSection.c_str());
#else
GfLogDebug("section %zu: %s\n", i, strSection.c_str());
#endif
size_t page = GfParmGetNum(hparmItems, strSection.c_str(), "page", "", 0);
size_t index = GfParmGetNum(hparmItems, strSection.c_str(), "index", "", 0);
@ -386,11 +382,7 @@ void CarSetupMenu::loadSettings()
if (index >= ITEMS_PER_PAGE)
{
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogError("Invalid index %Iu\n", index);
#else
GfLogError("Invalid index %zu\n", index);
#endif
continue;
}
@ -422,15 +414,9 @@ void CarSetupMenu::loadSettings()
else
att.value = att.defaultValue;
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogDebug("section: \"%s\" param: \"%s\" units: \"%s\" label: \"%s\" page: %Iu "
"index: %Iu precision: %d labelId: %d editId: %d defaultLabelId: %d "
"exists: %d min: %f default %f max: %f value: %f\n",
#else
GfLogDebug("section: \"%s\" param: \"%s\" units: \"%s\" label: \"%s\" page: %zu "
"index: %zu precision: %d labelId: %d editId: %d defaultLabelId: %d "
"exists: %d min: %f default %f max: %f value: %f\n",
#endif
att.section.c_str(), att.param.c_str(), att.units.c_str(),
att.label.c_str(), page, index, att.precision, att.labelId, att.editId,
att.defaultLabelId, att.exists, att.minValue, att.defaultValue, att.maxValue, att.value);
@ -447,15 +433,9 @@ void CarSetupMenu::loadSettings()
else
att.strValue = att.defaultStrValue;
#if defined(_MSC_VER) && _MSC_VER < 1800
GfLogDebug("section: \"%s\" param: \"%s\" label: \"%s\" page: %Iu "
"index: %Iu labelId: %d comboId: %d defaultLabelId: %d "
"exists: %d, in: %Iu default: \"%s\" value: \"%s\"\n",
#else
GfLogDebug("section: \"%s\" param: \"%s\" label: \"%s\" page: %zu "
"index: %zu labelId: %d comboId: %d defaultLabelId: %d "
"exists: %d, in: %zu default: \"%s\" value: \"%s\"\n",
#endif
att.section.c_str(), att.param.c_str(), att.label.c_str(),
page, index, att.labelId, att.comboId, att.defaultLabelId,
att.exists, att.in.size(), att.defaultStrValue.c_str(),

4
src/tools/trackgen/relief.cpp
View File

@ -91,11 +91,7 @@ void LoadRelief(tTrack *track, void *TrackHandle, const std::string &reliefFile)
Root = ssgLoadAC(reliefFile.c_str());
#if defined(_MSC_VER) && _MSC_VER < 1800
printf("Relief: %Iu interior, %Iu exterior\n", InteriorList.size(), ExteriorList.size());
#else
printf("Relief: %zu interior, %zu exterior\n", InteriorList.size(), ExteriorList.size());
#endif
}
static void countRec(ssgEntity *e, int *nb_vert, int *nb_seg)