MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Warning-squashing

develop
Petr Mrázek 2010-05-02 02:38:18 +02:00
parent bae9939e50
commit 5b57a71ac4
30 changed files with 376 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dfhack/CMakeLists.txt
Unescape Escape View File

@ -101,7 +101,7 @@ IF(UNIX)
add_definitions(-DLINUX_BUILD)
add_definitions(-DUSE_CONFIG_H)
find_library(X11_LIBRARY X11)
SET(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -pedantic")
SET(CMAKE_CXX_FLAGS_DEBUG "-g -Wall")
SET(CMAKE_CXX_FLAGS "-fvisibility=hidden")
SET(PROJECT_LIBS ${X11_LIBRARY} rt ) #dfhack-md5 dfhack-tixml

1
dfhack/DFHackAPI.cpp
Unescape Escape View File

@ -589,3 +589,4 @@ bool API::ReadItemTypes(vector< vector< t_itemType > > & itemTypes)
return true;
}
*/

42
dfhack/DFHackAPI_C.cpp
Unescape Escape View File

@ -48,6 +48,7 @@ DFHackObject* API_Alloc(const char* path_to_xml)
return (DFHackObject*)api;
}
//FIXME: X:\dfhack\DFHackAPI_C.cpp:56: warning: deleting `DFHackObject* ' is undefined
void API_Free(DFHackObject* api)
{
if(api != NULL)
@ -61,12 +62,8 @@ int API_Attach(DFHackObject* api)
{
if(api != NULL)
{
if(((DFHack::API*)api)->Attach())
return 1;
else
return 0;
return ((DFHack::API*)api)->Attach();
}
return -1;
}
@ -74,10 +71,7 @@ int API_Detach(DFHackObject* api)
{
if(api != NULL)
{
if(((DFHack::API*)api)->Detach())
return 1;
else
return 0;
return ((DFHack::API*)api)->Detach();
}
return -1;
@ -87,10 +81,7 @@ int API_isAttached(DFHackObject* api)
{
if(api != NULL)
{
if(((DFHack::API*)api)->isAttached())
return 1;
else
return 0;
return ((DFHack::API*)api)->isAttached();
}
return -1;
@ -100,10 +91,7 @@ int API_Suspend(DFHackObject* api)
{
if(api != NULL)
{
if(((DFHack::API*)api)->Suspend())
return 1;
else
return 0;
return ((DFHack::API*)api)->Suspend();
}
return -1;
@ -113,10 +101,7 @@ int API_Resume(DFHackObject* api)
{
if(api != NULL)
{
if(((DFHack::API*)api)->Resume())
return 1;
else
return 0;
return ((DFHack::API*)api)->Resume();
}
return -1;
@ -126,10 +111,7 @@ int API_isSuspended(DFHackObject* api)
{
if(api != NULL)
{
if(((DFHack::API*)api)->isSuspended())
return 1;
else
return 0;
return ((DFHack::API*)api)->isSuspended();
}
return -1;
@ -139,10 +121,7 @@ int API_ForceResume(DFHackObject* api)
{
if(api != NULL)
{
if(((DFHack::API*)api)->ForceResume())
return 1;
else
return 0;
return ((DFHack::API*)api)->ForceResume();
}
return -1;
@ -152,10 +131,7 @@ int API_AsyncSuspend(DFHackObject* api)
{
if(api != NULL)
{
if(((DFHack::API*)api)->AsyncSuspend())
return 1;
else
return 0;
return ((DFHack::API*)api)->AsyncSuspend();
}
return -1;

1
dfhack/DFMemInfo.cpp
Unescape Escape View File

@ -629,3 +629,4 @@ string memory_info::getLabor (const uint32_t laborIdx)
}
throw Error::MissingMemoryDefinition("labor", laborIdx);
}

1
dfhack/include/DFCommonInternal.h
Unescape Escape View File

@ -96,3 +96,4 @@ using namespace std;
*/
#endif // DFCOMMONINTERNAL_H_INCLUDED

8
dfhack/include/DFMiscUtils.h
Unescape Escape View File

@ -14,6 +14,11 @@ using namespace std;
#include <DFMemInfo.h>
#include <DFVector.h>
/*
* This is a header full of ugly, volatile things.
* Only for use of official DFHack tools!
*/
void DumpObjStr0Vector (const char * name, DFHack::Process *p, uint32_t addr)
{
cout << "----==== " << name << " ====----" << endl;
@ -216,6 +221,5 @@ std::string PrintSplatterType (int16_t mat1, int32_t mat2, vector<DFHack::t_matg
break;
}
}
#endif

1
dfhack/include/modules/Gui.h
Unescape Escape View File

@ -32,3 +32,4 @@ namespace DFHack
};
}
#endif

1
dfhack/modules/Buildings.cpp
Unescape Escape View File

@ -169,3 +169,4 @@ int32_t Buildings::GetCustomWorkshopType(t_building & building)
}
return ret;
}

1
dfhack/modules/Constructions.cpp
Unescape Escape View File

@ -98,3 +98,4 @@ bool Constructions::Finish()
d->Started = false;
return true;
}

1
dfhack/modules/Maps.cpp
Unescape Escape View File

@ -834,3 +834,4 @@ bool Maps::ReadGlobalFeatures( std::vector <t_feature> & features)
}
return true;
}

1
dfhack/modules/Position.cpp
Unescape Escape View File

@ -156,3 +156,4 @@ bool Position::getWindowSize (int32_t &width, int32_t &height)
height = coords[1];
return true;
}

2
dfhack/modules/Position_C.cpp
Unescape Escape View File

@ -1,6 +1,6 @@
/*
www.sourceforge.net/projects/dfhack
Copyright (c) 2009 Petr Mrázek (peterix), Kenneth Ferland (Impaler[WrG]), dorf, doomchild
Copyright (c) 2009 Petr Mrázek (peterix), Kenneth Ferland (Impaler[WrG]), dorf, doomchild
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any

1
dfhack/modules/Translation.cpp
Unescape Escape View File

@ -195,3 +195,4 @@ string Translation::TranslateName(const t_name &name, bool inEnglish)
}
return out;
}

1
dfhack/modules/Vegetation.cpp
Unescape Escape View File

@ -96,3 +96,4 @@ bool Vegetation::Finish()
d->Started = false;
return true;
}

1
dfhack/private/APIPrivate.h
Unescape Escape View File

@ -99,3 +99,4 @@ namespace DFHack
};
}
#endif

2
dfhack/python/CMakeLists.txt
Unescape Escape View File

@ -8,7 +8,7 @@ SET(PROJECT_LIBS ${PYTHON_LIBRARIES} dfhack )
IF(UNIX)
add_definitions(-DLINUX_BUILD)
add_definitions(-DUSE_CONFIG_H)
SET(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -pedantic")
SET(CMAKE_CXX_FLAGS_DEBUG "-g -Wall")
SET(PYTHON_MODULE_SUFFIX ".so")
ENDIF(UNIX)
IF(WIN32)

2
dfhack/python/DF_CreatureManager.cpp
Unescape Escape View File

@ -26,7 +26,7 @@ distribution.
#define __DFCREATURES__
#include <string>
#include "Python.h"
#include <Python.h>
#include "stdio.h"
#include <vector>
#include "integers.h"

2
dfhack/python/DF_CreatureType.cpp
Unescape Escape View File

@ -135,6 +135,8 @@ static void DF_Creature_Base_dealloc(DF_Creature_Base* self)
}
}
#pragma GCC diagnostic ignored "-Wwrite-strings"
static PyMemberDef DF_Creature_Base_members[] =
{
{"origin", T_UINT, offsetof(DF_Creature_Base, origin), 0, ""},

1
dfhack/python/DF_GUI.cpp
Unescape Escape View File

@ -24,6 +24,7 @@ distribution.
#ifndef __DFGUI__
#define __DFGUI__
#pragma GCC diagnostic ignored "-Wwrite-strings"
#include "Python.h"
#include "integers.h"

1
dfhack/python/DF_Maps.cpp
Unescape Escape View File

@ -24,6 +24,7 @@ distribution.
#ifndef __DFMAPS__
#define __DFMAPS__
#pragma GCC diagnostic ignored "-Wwrite-strings"
#include "Python.h"
#include <vector>

2
dfhack/python/DF_MemInfo.cpp
Unescape Escape View File

@ -24,6 +24,7 @@ distribution.
#ifndef __DF_MEMINFO__
#define __DF_MEMINFO__
#pragma GCC diagnostic ignored "-Wwrite-strings"
#include "Python.h"
#include <string>
@ -31,7 +32,6 @@ distribution.
using namespace std;
#include "Export.h"
//#include "DFCommonInternal.h"
#include "DFMemInfo.h"
using namespace DFHack;

1
dfhack/python/DF_Position.cpp
Unescape Escape View File

@ -24,6 +24,7 @@ distribution.
#ifndef __DFPOSITION__
#define __DFPOSITION__
#pragma GCC diagnostic ignored "-Wwrite-strings"
#include "Python.h"
#include "integers.h"

1
dfhack/python/DF_Translate.cpp
Unescape Escape View File

@ -24,6 +24,7 @@ distribution.
#ifndef __DFTRANSLATE__
#define __DFTRANSLATE__
#pragma GCC diagnostic ignored "-Wwrite-strings"
#include "Python.h"
#include <vector>

1
dfhack/shm/mod-core.h
Unescape Escape View File

@ -97,3 +97,4 @@ enum CORE_COMMAND
NUM_CORE_CMDS
};
#endif

2
dfhack/shm/mod-creature40d.h
Unescape Escape View File

@ -105,5 +105,5 @@ DFPP_module Init(void);
}
}
}
#endif

2
dfhack/shm/mod-maps.h
Unescape Escape View File

@ -112,5 +112,5 @@ DFPP_module Init(void);
}
}
}
#endif

54
examples/dfitemdump.cpp
Unescape Escape View File

@ -24,20 +24,20 @@ DFHack::Materials * Materials;
std::string getMatDesc(int32_t typeB, int32_t typeC, int32_t typeD)
{
if( (typeC<419) || (typeC>618) )
if ( (typeC<419) || (typeC>618) )
{
if( (typeC<19) || (typeC>218) )
if ( (typeC<19) || (typeC>218) )
{
if(typeC)
if(typeC>0x292)
if (typeC)
if (typeC>0x292)
return "?";
else
{
if(typeC>=Materials->other.size())
if (typeC>=Materials->other.size())
return "stuff";
else
{
if(typeD==-1)
if (typeD==-1)
return std::string(Materials->other[typeC].rawname);
else
return std::string(Materials->other[typeC].rawname) + " derivate";
@ -48,10 +48,10 @@ std::string getMatDesc(int32_t typeB, int32_t typeC, int32_t typeD)
}
else
{
if(typeD>=Materials->raceEx.size())
if (typeD>=Materials->raceEx.size())
return "unknown race";
typeC-=19;
if((typeC<0) || (typeC>=Materials->raceEx[typeD].extract.size()))
if ((typeC<0) || (typeC>=Materials->raceEx[typeD].extract.size()))
{
return string(Materials->raceEx[typeD].rawname).append(" extract");
}
@ -92,7 +92,7 @@ int main ()
printf("type\tvtable\tname\tquality\tdecorate\n");
for(i=0;i<size;i++)
for (i=0;i<size;i++)
{
uint32_t vtable = p->readDWord(p_items[i]);
uint32_t func0 = p->readDWord(vtable);
@ -116,34 +116,34 @@ int main ()
bool hasDecorations;
string desc = p->readClassName(vtable);
if( (funct0&0xFFFFFFFFFF000000LL) != 0xCCCCC30000000000LL )
if ( (funct0&0xFFFFFFFFFF000000LL) != 0xCCCCC30000000000LL )
{
if(funct0 == 0xCCCCCCCCCCC3C033LL)
if (funct0 == 0xCCCCCCCCCCC3C033LL)
type = 0;
else
printf("bad type function address=%p", (void*)func0);
}
if(funct1 == 0xC300000092818B66LL)
if (funct1 == 0xC300000092818B66LL)
quality = p->readWord(p_items[i]+0x92);
else if(funct1 == 0xCCCCCCCCCCC3C033)
else if (funct1 == 0xCCCCCCCCCCC3C033LL)
quality = 0;
else
printf("bad quality function address=%p\n", (void*) func1);
if(funct2 == 0xCCCCCCCCCCC3C032LL)
if (funct2 == 0xCCCCCCCCCCC3C032LL)
hasDecorations = false;
else if(funct2 == 0xCCCCCCCCCCC301B0)
else if (funct2 == 0xCCCCCCCCCCC301B0LL)
hasDecorations = true;
else
printf("bad decoration function address=%p\n", (void*) func2);
if(funcBt == 0xCCCCCCCCC3FFC883LL)
if (funcBt == 0xCCCCCCCCC3FFC883LL)
typeB = -1;
else
{
uint64_t funcBtEnd = p->readQuad(funcB+8);
if(
if (
((funcBt&0xFFFFFFFF0000FFFFLL) == 0x8B6600000000818BLL) &&
((funcBtEnd&0xFFFFFFFFFFFF00FFLL) == 0xCCCCCCCCCCC30040LL) )
{
@ -152,7 +152,7 @@ int main ()
uint32_t pt1 = p->readDWord(p_items[i] + off1);
typeB = p->readWord(pt1 + off2);
}
else if((funcBt&0xFFFFFF0000FFFFFFLL)==0xC300000000818B66LL)
else if ((funcBt&0xFFFFFF0000FFFFFFLL)==0xC300000000818B66LL)
{
uint32_t off1 = (funcBt>>24) & 0xffff;
typeB = p->readWord(p_items[i] + off1);
@ -161,9 +161,9 @@ int main ()
printf("bad typeB func @%p\n", (void*) funcB);
}
if(funcCt == 0xCCCCCCCCC3FFC883LL)
if (funcCt == 0xCCCCCCCCC3FFC883LL)
typeC = -1;
else if( (funcCt&0xFFFFFF0000FFFFFFLL) == 0xC300000000818B66 )
else if ( (funcCt&0xFFFFFF0000FFFFFFLL) == 0xC300000000818B66LL )
{
uint32_t off1 = (funcCt>>24)&0xffff;
typeC = p->readWord(p_items[i] + off1);
@ -171,9 +171,9 @@ int main ()
else
printf("bad typeC func @%p\n", (void*) funcC);
if(funcDt == 0xCCCCCCCCC3FFC883LL)
if (funcDt == 0xCCCCCCCCC3FFC883LL)
typeD = -1;
else if( (funcDt&0xFFFFFFFF0000FFFFLL) == 0xCCC300000000818BLL )
else if ( (funcDt&0xFFFFFFFF0000FFFFLL) == 0xCCC300000000818BLL )
{
uint32_t off1 = (funcDt>>16) & 0xffff;
typeD = p->readDWord(p_items[i] + off1);
@ -190,15 +190,15 @@ int main ()
printf("%d\t%p\t%s\t%d\t[%d,%d,%d -> %s]", type, (void*)vtable, desc.c_str(), quality,
typeB, typeC, typeD, getMatDesc(typeB, typeC, typeD).c_str());
// printf("\t%p\t%.16LX", (void *) funcD, funcDt);
if(hasDecorations)
if (hasDecorations)
{
bool sep = false;
printf("\tdeco=[");
uint32_t decStart = p->readDWord(p_items[i] + 0xAC);
uint32_t decEnd = p->readDWord(p_items[i] + 0xB0);
if(decStart != decEnd)
if (decStart != decEnd)
{
for(j=decStart;j<decEnd;j+=4)
for (j=decStart;j<decEnd;j+=4)
{
uint32_t decoration = p->readDWord(j);
uint32_t dvtable = p->readDWord(decoration);
@ -209,11 +209,11 @@ int main ()
uint32_t dtypeD = p->readDWord(decoration + 0x8);
uint32_t dtype = 0;
uint32_t dqual = p->readWord(decoration + 20);
if( (dtypefunct&0xFFFFFFFFFFFF00FFLL) == 0xCCCCC300000000B8LL)
if ( (dtypefunct&0xFFFFFFFFFFFF00FFLL) == 0xCCCCC300000000B8LL)
dtype = (dtypefunct>>8)&0xfffffff;
else
printf("bad decoration type function, address=%p\n", (void*) dtypefunc);
if(sep)
if (sep)
printf(",");
printf("%s[t=%d,q=%d,%s{%d,%d}]", ddesc.c_str(), dtype, dqual, getMatDesc(-1, dtypeC, dtypeD).c_str(), dtypeC, dtypeD);
sep = true;

1
examples/hotkeynotedump.cpp
Unescape Escape View File

@ -66,3 +66,4 @@ int main (void)
#endif
return 0;
}

6
examples/veinlook.cpp
Unescape Escape View File

@ -162,7 +162,7 @@ int puttile(int x, int y, int tiletype, int color)
attroff(COLOR_PAIR(color));
}
int cprintf(char *fmt, ...)
int cprintf(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
@ -440,7 +440,7 @@ void do_features(API& DF, mapblock40d * block, uint32_t blockX, uint32_t blockY,
cprintf("You've discovered it already!");
}
char * matname = "unknown";
char * matname = (char *) "unknown";
// is stone?
if(ftr.main_material == 0)
{
@ -468,7 +468,7 @@ void do_features(API& DF, mapblock40d * block, uint32_t blockX, uint32_t blockY,
gotoxy(printX,printY+ 5);
cprintf("You've discovered it already!");
}
char * matname = "unknown";
char * matname = (char *) "unknown";
// is stone?
if(ftr.main_material == 0)
{