thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

silenced some warnings

Browse source 
svn-id: r39566
This commit is contained in:
Max Horn 2009-03-20 13:30:10 +00:00
parent 1365b22359
commit ed292fb498
3 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/m4/compression.h
View file

@ -52,7 +52,7 @@ private:
public: public:
static bool isCompressed(Common::SeekableReadStream *stream); static bool isCompressed(Common::SeekableReadStream *stream);
MadsPack(Common::SeekableReadStream *stream); MadsPack(Common::SeekableReadStream *stream);
MadsPack(const char *resourceName, M4Engine* _vm); MadsPack(const char *resourceName, M4Engine *vm);
~MadsPack(); ~MadsPack();
int getCount() const { return _count; } int getCount() const { return _count; }

34
engines/sci/engine/seg_manager.cpp
View file

@ -1456,10 +1456,10 @@ reg_t SegInterface::findCanonicAddress(reg_t addr) {
void SegInterface::freeAtAddress(reg_t sub_addr) { void SegInterface::freeAtAddress(reg_t sub_addr) {
} }
void SegInterface::listAllDeallocatable(void *param, void (*note)(void *param, reg_t addr)) { void SegInterface::listAllDeallocatable(void *param, NoteCallback note) {
} }
void SegInterface::listAllOutgoingReferences(EngineState *s, reg_t object, void *param, void (*note)(void *param, reg_t addr)) { void SegInterface::listAllOutgoingReferences(EngineState *s, reg_t object, void *param, NoteCallback note) {
} }
@ -1470,7 +1470,7 @@ protected:
SegInterface(segmgr, mobj, segId, typeId) {} SegInterface(segmgr, mobj, segId, typeId) {}
public: public:
reg_t findCanonicAddress(reg_t addr); reg_t findCanonicAddress(reg_t addr);
void listAllDeallocatable(void *param, void (*note)(void *param, reg_t addr)); void listAllDeallocatable(void *param, NoteCallback note);
}; };
reg_t SegInterfaceBase::findCanonicAddress(reg_t addr) { reg_t SegInterfaceBase::findCanonicAddress(reg_t addr) {
@ -1478,7 +1478,7 @@ reg_t SegInterfaceBase::findCanonicAddress(reg_t addr) {
return addr; return addr;
} }
void SegInterfaceBase::listAllDeallocatable(void *param, void (*note)(void *param, reg_t addr)) { void SegInterfaceBase::listAllDeallocatable(void *param, NoteCallback note) {
(*note)(param, make_reg(_segId, 0)); (*note)(param, make_reg(_segId, 0));
} }
@ -1489,7 +1489,7 @@ public:
SegInterfaceScript(SegManager *segmgr, MemObject *mobj, SegmentId segId) : SegInterfaceScript(SegManager *segmgr, MemObject *mobj, SegmentId segId) :
SegInterfaceBase(segmgr, mobj, segId, MEM_OBJ_SCRIPT) {} SegInterfaceBase(segmgr, mobj, segId, MEM_OBJ_SCRIPT) {}
void freeAtAddress(reg_t addr); void freeAtAddress(reg_t addr);
void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void *param, reg_t addr)); void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note);
}; };
void SegInterfaceScript::freeAtAddress(reg_t addr) { void SegInterfaceScript::freeAtAddress(reg_t addr) {
@ -1504,7 +1504,7 @@ void SegInterfaceScript::freeAtAddress(reg_t addr) {
_segmgr->deallocateScript(script->nr); _segmgr->deallocateScript(script->nr);
} }
void SegInterfaceScript::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void *param, reg_t addr)) { void SegInterfaceScript::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note) {
Script *script = &(_mobj->data.script); Script *script = &(_mobj->data.script);
if (addr.offset <= script->buf_size && addr.offset >= -SCRIPT_OBJECT_MAGIC_OFFSET && RAW_IS_OBJECT(script->buf + addr.offset)) { if (addr.offset <= script->buf_size && addr.offset >= -SCRIPT_OBJECT_MAGIC_OFFSET && RAW_IS_OBJECT(script->buf + addr.offset)) {
@ -1544,15 +1544,15 @@ public:
SegInterfaceClones(SegManager *segmgr, MemObject *mobj, SegmentId segId) : SegInterfaceClones(SegManager *segmgr, MemObject *mobj, SegmentId segId) :
SegInterface(segmgr, mobj, segId, MEM_OBJ_CLONES) {} SegInterface(segmgr, mobj, segId, MEM_OBJ_CLONES) {}
void freeAtAddress(reg_t addr); void freeAtAddress(reg_t addr);
void listAllDeallocatable(void *param, void (*note)(void *param, reg_t addr)); void listAllDeallocatable(void *param, NoteCallback note);
void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void *param, reg_t addr)); void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note);
}; };
void SegInterfaceClones::listAllDeallocatable(void *param, void (*note)(void *param, reg_t addr)) { void SegInterfaceClones::listAllDeallocatable(void *param, NoteCallback note) {
LIST_ALL_DEALLOCATABLE(Clone, clones); LIST_ALL_DEALLOCATABLE(Clone, clones);
} }
void SegInterfaceClones::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void *param, reg_t addr)) { void SegInterfaceClones::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note) {
CloneTable *clone_table = &(_mobj->data.clones); CloneTable *clone_table = &(_mobj->data.clones);
Clone *clone; Clone *clone;
int i; int i;
@ -1608,7 +1608,7 @@ public:
SegInterface(segmgr, mobj, segId, MEM_OBJ_LOCALS) {} SegInterface(segmgr, mobj, segId, MEM_OBJ_LOCALS) {}
reg_t findCanonicAddress(reg_t addr); reg_t findCanonicAddress(reg_t addr);
void freeAtAddress(reg_t addr); void freeAtAddress(reg_t addr);
void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void *param, reg_t addr)); void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note);
}; };
reg_t SegInterfaceLocals::findCanonicAddress(reg_t addr) { reg_t SegInterfaceLocals::findCanonicAddress(reg_t addr) {
@ -1643,7 +1643,7 @@ public:
SegInterfaceStack(SegManager *segmgr, MemObject *mobj, SegmentId segId) : SegInterfaceStack(SegManager *segmgr, MemObject *mobj, SegmentId segId) :
SegInterface(segmgr, mobj, segId, MEM_OBJ_STACK) {} SegInterface(segmgr, mobj, segId, MEM_OBJ_STACK) {}
reg_t findCanonicAddress(reg_t addr); reg_t findCanonicAddress(reg_t addr);
void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void *param, reg_t addr)); void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note);
}; };
reg_t SegInterfaceStack::findCanonicAddress(reg_t addr) { reg_t SegInterfaceStack::findCanonicAddress(reg_t addr) {
@ -1681,8 +1681,8 @@ public:
SegInterfaceLists(SegManager *segmgr, MemObject *mobj, SegmentId segId) : SegInterfaceLists(SegManager *segmgr, MemObject *mobj, SegmentId segId) :
SegInterface(segmgr, mobj, segId, MEM_OBJ_LISTS) {} SegInterface(segmgr, mobj, segId, MEM_OBJ_LISTS) {}
void freeAtAddress(reg_t addr); void freeAtAddress(reg_t addr);
void listAllDeallocatable(void *param, void (*note)(void *param, reg_t addr)); void listAllDeallocatable(void *param, NoteCallback note);
void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void *param, reg_t addr)); void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note);
}; };
void SegInterfaceLists::freeAtAddress(reg_t sub_addr) { void SegInterfaceLists::freeAtAddress(reg_t sub_addr) {
@ -1715,8 +1715,8 @@ public:
SegInterfaceNodes(SegManager *segmgr, MemObject *mobj, SegmentId segId) : SegInterfaceNodes(SegManager *segmgr, MemObject *mobj, SegmentId segId) :
SegInterface(segmgr, mobj, segId, MEM_OBJ_NODES) {} SegInterface(segmgr, mobj, segId, MEM_OBJ_NODES) {}
void freeAtAddress(reg_t addr); void freeAtAddress(reg_t addr);
void listAllDeallocatable(void *param, void (*note)(void *param, reg_t addr)); void listAllDeallocatable(void *param, NoteCallback note);
void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void *param, reg_t addr)); void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note);
}; };
void SegInterfaceNodes::freeAtAddress(reg_t sub_addr) { void SegInterfaceNodes::freeAtAddress(reg_t sub_addr) {
@ -1751,7 +1751,7 @@ public:
SegInterfaceHunk(SegManager *segmgr, MemObject *mobj, SegmentId segId) : SegInterfaceHunk(SegManager *segmgr, MemObject *mobj, SegmentId segId) :
SegInterface(segmgr, mobj, segId, MEM_OBJ_HUNK) {} SegInterface(segmgr, mobj, segId, MEM_OBJ_HUNK) {}
void freeAtAddress(reg_t addr); void freeAtAddress(reg_t addr);
void listAllDeallocatable(void *param, void (*note)(void *param, reg_t addr)); void listAllDeallocatable(void *param, NoteCallback note);
}; };
void SegInterfaceHunk::freeAtAddress(reg_t sub_addr) { void SegInterfaceHunk::freeAtAddress(reg_t sub_addr) {

6
engines/sci/engine/seg_manager.h
View file

@ -454,6 +454,8 @@ protected:
SegInterface(SegManager *segmgr, MemObject *mobj, SegmentId segId, memObjType typeId); SegInterface(SegManager *segmgr, MemObject *mobj, SegmentId segId, memObjType typeId);
public: public:
typedef void (*NoteCallback)(void *param, reg_t addr);
// Deallocates the segment interface // Deallocates the segment interface
virtual ~SegInterface() {} virtual ~SegInterface() {}
@ -471,14 +473,14 @@ public:
// Parameters: note : (voidptr * addr) -> (): Invoked for each address on which free_at_address() // Parameters: note : (voidptr * addr) -> (): Invoked for each address on which free_at_address()
// makes sense // makes sense
// (void *) param: Parameter passed to 'note' // (void *) param: Parameter passed to 'note'
virtual void listAllDeallocatable(void *param, void (*note)(void *param, reg_t addr)); virtual void listAllDeallocatable(void *param, NoteCallback note);
// Iterates over all references reachable from the specified object // Iterates over all references reachable from the specified object
// Parameters: (reg_t) object: The object (within the current segment) to analyse // Parameters: (reg_t) object: The object (within the current segment) to analyse
// (void *) param: Parameter passed to 'note' // (void *) param: Parameter passed to 'note'
// note : (voidptr * addr) -> (): Invoked for each outgoing reference within the object // note : (voidptr * addr) -> (): Invoked for each outgoing reference within the object
// Note: This function may also choose to report numbers (segment 0) as adresses // Note: This function may also choose to report numbers (segment 0) as adresses
virtual void listAllOutgoingReferences(EngineState *s, reg_t object, void *param, void (*note)(void *param, reg_t addr)); virtual void listAllOutgoingReferences(EngineState *s, reg_t object, void *param, NoteCallback note);
// Get the memory object // Get the memory object
MemObject *getMobj() { return _mobj; } MemObject *getMobj() { return _mobj; }