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

[thebluegr at users.sourceforge.net]

Revision: 49990
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49990&view=rev
Author:   thebluegr
Date:     2010-06-18 02:03:28 +0000 (Fri, 18 Jun 2010)

Log Message:
-----------
Turned more warnings into errors, some cleanup

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

Modified: scummvm/trunk/engines/sci/engine/klists.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.cpp	2010-06-18 02:01:30 UTC (rev 49989)
+++ scummvm/trunk/engines/sci/engine/klists.cpp	2010-06-18 02:03:28 UTC (rev 49990)
@@ -127,31 +127,6 @@
 	// This function is not needed in ScummVM. The garbage collector
 	// cleans up unused objects automatically
 
-#if 0
-	List *l = s->_segMan->lookupList(argv[0]);
-
-	if (!l) {
-		// FIXME: This should be an error, but it's turned to a warning for now
-		warning("Attempt to dispose non-list at %04x:%04x", PRINT_REG(argv[0]));
-		return NULL_REG;
-	}
-
-	checkListPointer(s->_segMan, argv[0]);
-
-	if (!l->first.isNull()) {
-		reg_t n_addr = l->first;
-
-		while (!n_addr.isNull()) { // Free all nodes
-			Node *n = s->_segMan->lookupNode(n_addr);
-			n_addr = n->succ;
-
-			//s->_segMan->free_Node(n_addr);	// TODO
-		}
-	}
-
-	//s->_segMan->free_list(argv[0]);	// TODO
-#endif
-
 	return s->r_acc;
 }
 
@@ -211,9 +186,8 @@
 
 	debugC(2, kDebugLevelNodes, "Adding node %04x:%04x to end of list %04x:%04x", PRINT_REG(nodebase), PRINT_REG(listbase));
 
-	// FIXME: This should be an error, but it's turned to a warning for now
 	if (!new_n)
-		warning("Attempt to add non-node (%04x:%04x) to list at %04x:%04x", PRINT_REG(nodebase), PRINT_REG(listbase));
+		error("Attempt to add non-node (%04x:%04x) to list at %04x:%04x", PRINT_REG(nodebase), PRINT_REG(listbase));
 	checkListPointer(s->_segMan, listbase);
 
 	new_n->succ = l->first;
@@ -234,9 +208,8 @@
 
 	debugC(2, kDebugLevelNodes, "Adding node %04x:%04x to end of list %04x:%04x", PRINT_REG(nodebase), PRINT_REG(listbase));
 
-	// FIXME: This should be an error, but it's turned to a warning for now
 	if (!new_n)
-		warning("Attempt to add non-node (%04x:%04x) to list at %04x:%04x", PRINT_REG(nodebase), PRINT_REG(listbase));
+		error("Attempt to add non-node (%04x:%04x) to list at %04x:%04x", PRINT_REG(nodebase), PRINT_REG(listbase));
 	checkListPointer(s->_segMan, listbase);
 
 	new_n->succ = NULL_REG;
@@ -287,9 +260,8 @@
 
 	checkListPointer(s->_segMan, argv[0]);
 
-	// FIXME: This should be an error, but it's turned to a warning for now
 	if (!newnode) {
-		warning("New 'node' %04x:%04x is not a node", PRINT_REG(argv[2]));
+		error("New 'node' %04x:%04x is not a node", PRINT_REG(argv[2]));
 		return NULL_REG;
 	}
 


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