[Scummvm-cvs-logs] SF.net SVN: scummvm:[39606] scummvm/trunk/engines/sci/engine/seg_manager. cpp

[fingolfin at users.sourceforge.net]

Revision: 39606
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39606&view=rev
Author:   fingolfin
Date:     2009-03-22 13:50:37 +0000 (Sun, 22 Mar 2009)

Log Message:
-----------
SCI: Fix warnings

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/seg_manager.cpp

Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp	2009-03-22 11:24:23 UTC (rev 39605)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp	2009-03-22 13:50:37 UTC (rev 39606)
@@ -1626,7 +1626,7 @@
 	// STUB
 }
 
-void SegInterfaceLocals::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void*param, reg_t addr)) {
+void SegInterfaceLocals::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note) {
 	LocalVariables *locals = &(_mobj->data.locals);
 	int i;
 
@@ -1651,7 +1651,7 @@
 	return addr;
 }
 
-void SegInterfaceStack::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void*param, reg_t addr)) {
+void SegInterfaceStack::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note) {
 	int i;
 	fprintf(stderr, "Emitting %d stack entries\n", _mobj->data.stack.nr);
 	for (i = 0; i < _mobj->data.stack.nr; i++)
@@ -1689,11 +1689,11 @@
 	Sci::free_List_entry(&(_mobj->data.lists), sub_addr.offset);
 }
 
-void SegInterfaceLists::listAllDeallocatable(void *param, void (*note)(void*param, reg_t addr)) {
+void SegInterfaceLists::listAllDeallocatable(void *param, NoteCallback note) {
 	LIST_ALL_DEALLOCATABLE(List, lists);
 }
 
-void SegInterfaceLists::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void*param, reg_t addr)) {
+void SegInterfaceLists::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note) {
 	ListTable *table = &(_mobj->data.lists);
 	List *list = &(table->table[addr.offset].entry);
 
@@ -1723,11 +1723,11 @@
 	Sci::free_Node_entry(&(_mobj->data.nodes), sub_addr.offset);
 }
 
-void SegInterfaceNodes::listAllDeallocatable(void *param, void (*note)(void*param, reg_t addr)) {
+void SegInterfaceNodes::listAllDeallocatable(void *param, NoteCallback note) {
 	LIST_ALL_DEALLOCATABLE(Node, nodes);
 }
 
-void SegInterfaceNodes::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, void (*note)(void*param, reg_t addr)) {
+void SegInterfaceNodes::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note) {
 	NodeTable *table = &(_mobj->data.nodes);
 	Node *node = &(table->table[addr.offset].entry);
 
@@ -1759,7 +1759,7 @@
 	// STUB
 }
 
-void SegInterfaceHunk::listAllDeallocatable(void *param, void (*note)(void*param, reg_t addr)) {
+void SegInterfaceHunk::listAllDeallocatable(void *param, NoteCallback note) {
 	LIST_ALL_DEALLOCATABLE(Hunk, hunks);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.