Update internal (and messy) copies to libcdio 0.71 and

vcdimager 0.7.21.

CVS patchset: 7313
CVS date: 2005/01/01 02:43:56

1 files changed, 4 insertions, 38 deletions

diff --git a/src/input/vcd/libvcd/data_structures.h b/src/input/vcd/libvcd/data_structures.h
index 9ce996f01..70fe88045 100644
--- a/src/input/vcd/libvcd/data_structures.h
+++ b/src/input/vcd/libvcd/data_structures.h
@@ -1,5 +1,5 @@
 /*
-    $Id: data_structures.h,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
+    $Id: data_structures.h,v 1.3 2005/01/01 02:43:59 rockyb Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
 
@@ -21,48 +21,14 @@
 #ifndef __VCD_DATA_STRUCTURES_H__
 #define __VCD_DATA_STRUCTURES_H__
 
+#include <cdio/ds.h>
 #include <libvcd/types.h>
 
-/* opaque... */
-
-typedef int (*_vcd_list_cmp_func) (void *data1, void *data2);
-
-typedef int (*_vcd_list_iterfunc) (void *data, void *user_data);
-
-/* methods */
-VcdList *_vcd_list_new (void);
-
-void _vcd_list_free (VcdList *list, int free_data);
-
-unsigned _vcd_list_length (const VcdList *list);
-
-void _vcd_list_sort (VcdList *list, _vcd_list_cmp_func cmp_func);
-
-void _vcd_list_prepend (VcdList *list, void *data);
-
-void _vcd_list_append (VcdList *list, void *data);
-
-void _vcd_list_foreach (VcdList *list, _vcd_list_iterfunc func, void *user_data);
-
-VcdListNode *_vcd_list_find (VcdList *list, _vcd_list_iterfunc cmp_func, void *user_data);
-
-#define _VCD_LIST_FOREACH(node, list) \
- for (node = _vcd_list_begin (list); node; node = _vcd_list_node_next (node))
-
 /* node ops */
 
-VcdListNode *_vcd_list_at (VcdList *list, int idx);
-
-VcdListNode *_vcd_list_begin (const VcdList *list);
-
-VcdListNode *_vcd_list_end (VcdList *list);
-
-VcdListNode *_vcd_list_node_next (VcdListNode *node);
-
-void _vcd_list_node_free (VcdListNode *node, int free_data);
-
-void *_vcd_list_node_data (VcdListNode *node);
+CdioListNode *_vcd_list_at (CdioList *list, int idx);
 
+void _vcd_list_sort (CdioList *list, _cdio_list_cmp_func cmp_func);
 
 /* n-way tree */