BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Get rid of all the string format warnings caused by the DSTACK macro

Browse Source
This commit is contained in:
Ciaran Gultnieks 2011-05-16 21:47:50 +01:00
parent 8bba9cde5c
commit 29932d4bdd
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/debug.h
View File

@ -169,7 +169,10 @@ private:
bool m_overflowed; bool m_overflowed;
}; };
#define DSTACK(...)\ #define DSTACK(msg)\
DebugStacker __debug_stacker(msg);
#define DSTACKF(...)\
char __buf[DEBUG_STACK_TEXT_SIZE];\ char __buf[DEBUG_STACK_TEXT_SIZE];\
snprintf(__buf,\ snprintf(__buf,\
DEBUG_STACK_TEXT_SIZE, __VA_ARGS__);\ DEBUG_STACK_TEXT_SIZE, __VA_ARGS__);\

8
src/map.cpp
View File

@ -3830,7 +3830,7 @@ MapChunk* ServerMap::generateChunk(v2s16 chunkpos1,
ServerMapSector * ServerMap::createSector(v2s16 p2d) ServerMapSector * ServerMap::createSector(v2s16 p2d)
{ {
DSTACK("%s: p2d=(%d,%d)", DSTACKF("%s: p2d=(%d,%d)",
__FUNCTION_NAME, __FUNCTION_NAME,
p2d.X, p2d.Y); p2d.X, p2d.Y);
@ -3982,7 +3982,7 @@ MapBlock * ServerMap::generateBlock(
core::map<v3s16, MapBlock*> &lighting_invalidated_blocks core::map<v3s16, MapBlock*> &lighting_invalidated_blocks
) )
{ {
DSTACK("%s: p=(%d,%d,%d)", DSTACKF("%s: p=(%d,%d,%d)",
__FUNCTION_NAME, __FUNCTION_NAME,
p.X, p.Y, p.Z); p.X, p.Y, p.Z);
@ -4618,7 +4618,7 @@ continue_generating:
MapBlock * ServerMap::createBlock(v3s16 p) MapBlock * ServerMap::createBlock(v3s16 p)
{ {
DSTACK("%s: p=(%d,%d,%d)", DSTACKF("%s: p=(%d,%d,%d)",
__FUNCTION_NAME, p.X, p.Y, p.Z); __FUNCTION_NAME, p.X, p.Y, p.Z);
/* /*
@ -4682,7 +4682,7 @@ MapBlock * ServerMap::emergeBlock(
core::map<v3s16, MapBlock*> &lighting_invalidated_blocks core::map<v3s16, MapBlock*> &lighting_invalidated_blocks
) )
{ {
DSTACK("%s: p=(%d,%d,%d), only_from_disk=%d", DSTACKF("%s: p=(%d,%d,%d), only_from_disk=%d",
__FUNCTION_NAME, __FUNCTION_NAME,
p.X, p.Y, p.Z, only_from_disk); p.X, p.Y, p.Z, only_from_disk);

10
src/mapblockobject.cpp
View File

@ -63,7 +63,7 @@ v3f MovingObject::getAbsoluteShowPos()
void MovingObject::move(float dtime, v3f acceleration) void MovingObject::move(float dtime, v3f acceleration)
{ {
DSTACK("%s: typeid=%i, pos=(%f,%f,%f), speed=(%f,%f,%f)" DSTACKF("%s: typeid=%i, pos=(%f,%f,%f), speed=(%f,%f,%f)"
", dtime=%f, acc=(%f,%f,%f)", ", dtime=%f, acc=(%f,%f,%f)",
__FUNCTION_NAME, __FUNCTION_NAME,
getTypeId(), getTypeId(),
@ -755,7 +755,7 @@ void MapBlockObjectList::step(float dtime, bool server, u32 daynight_ratio)
core::map<s16, bool> ids_to_delete; core::map<s16, bool> ids_to_delete;
{ {
DSTACK("%s: stepping objects", __FUNCTION_NAME); DSTACKF("%s: stepping objects", __FUNCTION_NAME);
for(core::map<s16, MapBlockObject*>::Iterator for(core::map<s16, MapBlockObject*>::Iterator
i = m_objects.getIterator(); i = m_objects.getIterator();
@ -763,7 +763,7 @@ void MapBlockObjectList::step(float dtime, bool server, u32 daynight_ratio)
{ {
MapBlockObject *obj = i.getNode()->getValue(); MapBlockObject *obj = i.getNode()->getValue();
DSTACK("%s: stepping object type %i", __FUNCTION_NAME, DSTACKF("%s: stepping object type %i", __FUNCTION_NAME,
obj->getTypeId()); obj->getTypeId());
if(server) if(server)
@ -791,7 +791,7 @@ void MapBlockObjectList::step(float dtime, bool server, u32 daynight_ratio)
} }
{ {
DSTACK("%s: deleting objects", __FUNCTION_NAME); DSTACKF("%s: deleting objects", __FUNCTION_NAME);
// Delete objects in delete queue // Delete objects in delete queue
for(core::map<s16, bool>::Iterator for(core::map<s16, bool>::Iterator
@ -815,7 +815,7 @@ void MapBlockObjectList::step(float dtime, bool server, u32 daynight_ratio)
return; return;
{ {
DSTACK("%s: object wrap loop", __FUNCTION_NAME); DSTACKF("%s: object wrap loop", __FUNCTION_NAME);
for(core::map<s16, MapBlockObject*>::Iterator for(core::map<s16, MapBlockObject*>::Iterator
i = m_objects.getIterator(); i = m_objects.getIterator();