[Scummvm-cvs-logs] SF.net SVN: scummvm:[39566] scummvm/trunk/engines
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Mar 20 14:30:12 CET 2009
Revision: 39566
http://scummvm.svn.sourceforge.net/scummvm/?rev=39566&view=rev
Author: fingolfin
Date: 2009-03-20 13:30:10 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
silenced some warnings
Modified Paths:
--------------
scummvm/trunk/engines/m4/compression.h
scummvm/trunk/engines/sci/engine/seg_manager.cpp
scummvm/trunk/engines/sci/engine/seg_manager.h
Modified: scummvm/trunk/engines/m4/compression.h
===================================================================
--- scummvm/trunk/engines/m4/compression.h 2009-03-20 11:34:40 UTC (rev 39565)
+++ scummvm/trunk/engines/m4/compression.h 2009-03-20 13:30:10 UTC (rev 39566)
@@ -52,7 +52,7 @@
public:
static bool isCompressed(Common::SeekableReadStream *stream);
MadsPack(Common::SeekableReadStream *stream);
- MadsPack(const char *resourceName, M4Engine* _vm);
+ MadsPack(const char *resourceName, M4Engine *vm);
~MadsPack();
int getCount() const { return _count; }
Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp 2009-03-20 11:34:40 UTC (rev 39565)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp 2009-03-20 13:30:10 UTC (rev 39566)
@@ -1456,10 +1456,10 @@
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 @@
SegInterface(segmgr, mobj, segId, typeId) {}
public:
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) {
@@ -1478,7 +1478,7 @@
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));
}
@@ -1489,7 +1489,7 @@
SegInterfaceScript(SegManager *segmgr, MemObject *mobj, SegmentId segId) :
SegInterfaceBase(segmgr, mobj, segId, MEM_OBJ_SCRIPT) {}
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) {
@@ -1504,7 +1504,7 @@
_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);
if (addr.offset <= script->buf_size && addr.offset >= -SCRIPT_OBJECT_MAGIC_OFFSET && RAW_IS_OBJECT(script->buf + addr.offset)) {
@@ -1544,15 +1544,15 @@
SegInterfaceClones(SegManager *segmgr, MemObject *mobj, SegmentId segId) :
SegInterface(segmgr, mobj, segId, MEM_OBJ_CLONES) {}
void freeAtAddress(reg_t addr);
- void listAllDeallocatable(void *param, void (*note)(void *param, reg_t addr));
- void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void *param, reg_t addr));
+ void listAllDeallocatable(void *param, NoteCallback note);
+ 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);
}
-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);
Clone *clone;
int i;
@@ -1608,7 +1608,7 @@
SegInterface(segmgr, mobj, segId, MEM_OBJ_LOCALS) {}
reg_t findCanonicAddress(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) {
@@ -1643,7 +1643,7 @@
SegInterfaceStack(SegManager *segmgr, MemObject *mobj, SegmentId segId) :
SegInterface(segmgr, mobj, segId, MEM_OBJ_STACK) {}
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) {
@@ -1681,8 +1681,8 @@
SegInterfaceLists(SegManager *segmgr, MemObject *mobj, SegmentId segId) :
SegInterface(segmgr, mobj, segId, MEM_OBJ_LISTS) {}
void freeAtAddress(reg_t addr);
- void listAllDeallocatable(void *param, void (*note)(void *param, reg_t addr));
- void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void *param, reg_t addr));
+ void listAllDeallocatable(void *param, NoteCallback note);
+ void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note);
};
void SegInterfaceLists::freeAtAddress(reg_t sub_addr) {
@@ -1715,8 +1715,8 @@
SegInterfaceNodes(SegManager *segmgr, MemObject *mobj, SegmentId segId) :
SegInterface(segmgr, mobj, segId, MEM_OBJ_NODES) {}
void freeAtAddress(reg_t addr);
- void listAllDeallocatable(void *param, void (*note)(void *param, reg_t addr));
- void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void *param, reg_t addr));
+ void listAllDeallocatable(void *param, NoteCallback note);
+ void listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note);
};
void SegInterfaceNodes::freeAtAddress(reg_t sub_addr) {
@@ -1751,7 +1751,7 @@
SegInterfaceHunk(SegManager *segmgr, MemObject *mobj, SegmentId segId) :
SegInterface(segmgr, mobj, segId, MEM_OBJ_HUNK) {}
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) {
Modified: scummvm/trunk/engines/sci/engine/seg_manager.h
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.h 2009-03-20 11:34:40 UTC (rev 39565)
+++ scummvm/trunk/engines/sci/engine/seg_manager.h 2009-03-20 13:30:10 UTC (rev 39566)
@@ -454,6 +454,8 @@
SegInterface(SegManager *segmgr, MemObject *mobj, SegmentId segId, memObjType typeId);
public:
+ typedef void (*NoteCallback)(void *param, reg_t addr);
+
// Deallocates the segment interface
virtual ~SegInterface() {}
@@ -471,14 +473,14 @@
// Parameters: note : (voidptr * addr) -> (): Invoked for each address on which free_at_address()
// makes sense
// (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
// Parameters: (reg_t) object: The object (within the current segment) to analyse
// (void *) param: Parameter passed to 'note'
// note : (voidptr * addr) -> (): Invoked for each outgoing reference within the object
// 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
MemObject *getMobj() { return _mobj; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list