[Scummvm-cvs-logs] SF.net SVN: scummvm:[38464] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 38464
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38464&view=rev
Author:   thebluegr
Date:     2009-02-18 10:28:16 +0000 (Wed, 18 Feb 2009)

Log Message:
-----------
Removed the unused queue code and memfrob() definition

Modified Paths:
--------------
    scummvm/trunk/engines/sci/include/resource.h
    scummvm/trunk/engines/sci/scicore/tools.cpp

Modified: scummvm/trunk/engines/sci/include/resource.h
===================================================================
--- scummvm/trunk/engines/sci/include/resource.h	2009-02-18 10:20:48 UTC (rev 38463)
+++ scummvm/trunk/engines/sci/include/resource.h	2009-02-18 10:28:16 UTC (rev 38464)
@@ -147,45 +147,6 @@
 **             (int) src: value to write
 */
 
-/*-- queues --*/
-
-typedef struct _sci_queue_node {
-	void *data;
-	int type;
-	struct _sci_queue_node *next;
-} sci_queue_node_t;
-
-typedef struct {
-	sci_queue_node_t *start; /* Where things go in */
-	sci_queue_node_t *end;   /* Where they come out */
-} sci_queue_t;
-
-sci_queue_t *
-sci_init_queue(sci_queue_t *queue);
-/* Initializes an SCI queue
-** Parameters: (sci_queue_t *) queue: Pointer to the queue to initialize
-** Returns   : (sci_queue_t *) queue
-*/
-
-sci_queue_t *
-sci_add_to_queue(sci_queue_t *queue, void *data, int type);
-/* Adds an entry to an initialized SCI queue
-** Parameters: (sci_queue_t *) queue: The queue to add to
-**             (void *) data: The data to contain
-**             (int) type: Some metadata, e.g. size of the data block
-** Returns   : (sci_queue_t *) queue
-** The meaning of the 'type' field may be determined individually.
-*/
-
-void *
-sci_get_from_queue(sci_queue_t *queue, int *type);
-/* Reads an entry from an SCI queue
-** Parameters: (sci_queue_t *) queue: The queue to remove from
-**             (int *) type: A pointer to a variable to write the metadata
-**                     into, or NULL to omit this step
-** Returns   : (void *) The data block contained, or NULL if none was inside
-*/
-
 /* --- */
 
 void

Modified: scummvm/trunk/engines/sci/scicore/tools.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/tools.cpp	2009-02-18 10:20:48 UTC (rev 38463)
+++ scummvm/trunk/engines/sci/scicore/tools.cpp	2009-02-18 10:28:16 UTC (rev 38464)
@@ -72,10 +72,6 @@
 #  include <kos/thread.h>
 #endif
 
-#ifdef HAVE_MEMFROB
-void *memfrob(void *s, size_t n);
-#endif
-
 int script_debug_flag = 0; /* Defaulting to running mode */
 int sci_debug_flags = 0; /* Special flags */
 
@@ -421,51 +417,6 @@
 }
 
 
-sci_queue_t *
-sci_init_queue(sci_queue_t *queue) {
-	queue->start = queue->end = NULL;
-	return queue;
-}
-
-sci_queue_t *
-sci_add_to_queue(sci_queue_t *queue, void *data, int type) {
-	sci_queue_node_t *node = (sci_queue_node_t*)sci_malloc(sizeof(sci_queue_node_t));
-
-	node->next = NULL;
-	node->data = data;
-	node->type = type;
-
-	if (queue->start)
-		queue->start->next = node;
-
-	queue->start = node;
-
-	if (!queue->end)
-		queue->end = node;
-
-	return queue;
-}
-
-void *
-sci_get_from_queue(sci_queue_t *queue, int *type) {
-	sci_queue_node_t *node = queue->end;
-	if (node) {
-		void *retval = node->data;
-		if (type)
-			*type = node->type;
-
-		queue->end = node->next;
-
-		if (queue->end == NULL) /* Queue empty? */
-			queue->start = NULL;
-
-		free(node);
-		return retval;
-	}
-	return NULL;
-}
-
-
 /*-- Yielding to the scheduler --*/
 
 #ifdef HAVE_SCHED_YIELD


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