Make ds.h public. It should have been that way since it *is* public.

Eventually though we'll redo things using glib and then ds.h will get
removed.
This commit is contained in:
rocky
2004-10-09 03:20:28 +00:00
parent 6d187c9f54
commit 0dd6c21281
11 changed files with 58 additions and 54 deletions

View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.11 2004/07/25 16:35:29 rocky Exp $
# $Id: Makefile.am,v 1.12 2004/10/09 03:20:28 rocky Exp $
#
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
#
@@ -26,6 +26,7 @@ libcdioinclude_HEADERS = \
cdio.h \
cdtext.h \
cd_types.h \
ds.h \
dvd.h \
iso9660.h \
logging.h \

76
include/cdio/ds.h Normal file
View File

@@ -0,0 +1,76 @@
/*
$Id: ds.h,v 1.1 2004/10/09 03:20:28 rocky Exp $
Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Note: this header will is slated to get removed and libcdio will use
glib.h routines instead.
*/
#ifndef __CDIO_DS_H__
#define __CDIO_DS_H__
#include <cdio/types.h>
/* opaque... */
typedef struct _CdioList CdioList;
typedef struct _CdioListNode CdioListNode;
typedef int (*_cdio_list_cmp_func) (void *data1, void *data2);
typedef int (*_cdio_list_iterfunc) (void *data, void *user_data);
/* methods */
CdioList *_cdio_list_new (void);
void _cdio_list_free (CdioList *list, int free_data);
unsigned _cdio_list_length (const CdioList *list);
void _cdio_list_prepend (CdioList *list, void *data);
void _cdio_list_append (CdioList *list, void *data);
void _cdio_list_foreach (CdioList *list, _cdio_list_iterfunc func, void *user_data);
CdioListNode *_cdio_list_find (CdioList *list, _cdio_list_iterfunc cmp_func, void *user_data);
#define _CDIO_LIST_FOREACH(node, list) \
for (node = _cdio_list_begin (list); node; node = _cdio_list_node_next (node))
/* node ops */
CdioListNode *_cdio_list_begin (const CdioList *list);
CdioListNode *_cdio_list_end (CdioList *list);
CdioListNode *_cdio_list_node_next (CdioListNode *node);
void _cdio_list_node_free (CdioListNode *node, int free_data);
void *_cdio_list_node_data (CdioListNode *node);
#endif /* __CDIO_DS_H__ */
/*
* Local variables:
* c-file-style: "gnu"
* tab-width: 8
* indent-tabs-mode: nil
* End:
*/

View File

@@ -1,5 +1,5 @@
/*
$Id: iso9660.h,v 1.46 2004/09/04 23:49:47 rocky Exp $
$Id: iso9660.h,v 1.47 2004/10/09 03:20:28 rocky Exp $
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -340,7 +340,7 @@ typedef struct _iso9660 iso9660_t;
Open an ISO 9660 image for reading. Maybe in the future we will have
flags and mode. NULL is returned on error.
*/
iso9660_t *iso9660_open (const char *pathname /*flags, mode */);
iso9660_t *iso9660_open (const char *psz_pathname /*flags, mode */);
/*!
Close previously opened ISO 9660 image.
@@ -354,7 +354,7 @@ typedef struct _iso9660 iso9660_t;
Seek to a position and then read n bytes. Size read is returned.
*/
long int iso9660_iso_seek_read (const iso9660_t *p_iso, void *ptr,
lsn_t start, long int size);
lsn_t start, long int i_size);
/*!
Read the Primary Volume Descriptor for an ISO 9660 image.
@@ -424,7 +424,7 @@ bool iso9660_isachar (int c);
The length of the translated string is returned.
*/
int iso9660_name_translate(const char *oldname, char *newname);
int iso9660_name_translate(const char *psz_oldname, char *psz_newname);
/*!
Pad string src with spaces to size len and copy this to dst. If
@@ -462,7 +462,7 @@ bool iso9660_dirname_valid_p (const char pathname[]);
number. For example, mydir/file.ext -> MYDIR/FILE.EXT;1 for version
1. The resulting ISO-9660 pathname is returned.
*/
char *iso9660_pathname_isofy (const char pathname[], uint16_t version);
char *iso9660_pathname_isofy (const char pathname[], uint16_t i_version);
/*!
Check that pathname is a valid ISO-9660 pathname.
@@ -562,7 +562,7 @@ void * iso9660_fs_readdir (const CdIo *obj, const char pathname[], bool mode2);
Read pathname (a directory) and return a list of iso9660_stat_t
of the files inside that. The caller must free the returned result.
*/
void * iso9660_ifs_readdir (iso9660_t *iso, const char pathname[]);
void * iso9660_ifs_readdir (iso9660_t *p_iso, const char pathname[]);
/*!
Return the PVD's application ID.
@@ -571,12 +571,12 @@ void * iso9660_ifs_readdir (iso9660_t *iso, const char pathname[]);
const char * iso9660_get_application_id(const iso9660_pvd_t *p_pvd);
uint8_t iso9660_get_dir_len(const iso9660_dir_t *idr);
uint8_t iso9660_get_dir_len(const iso9660_dir_t *p_idr);
#if FIXME
uint8_t iso9660_get_dir_size(const iso9660_dir_t *idr);
uint8_t iso9660_get_dir_size(const iso9660_dir_t *p_idr);
lsn_t iso9660_get_dir_extent(const iso9660_dir_t *idr);
lsn_t iso9660_get_dir_extent(const iso9660_dir_t *p_idr);
#endif
/*!
@@ -584,7 +584,7 @@ lsn_t iso9660_get_dir_extent(const iso9660_dir_t *idr);
A string is allocated: the caller must deallocate.
*/
char * iso9660_dir_to_name (const iso9660_dir_t *iso9660_dir);
char * iso9660_dir_to_name (const iso9660_dir_t *p_iso9660_dir);
/*!
Return a string containing the preparer id with trailing
@@ -596,15 +596,15 @@ const char *iso9660_get_preparer_id(const iso9660_pvd_t *pvd);
Return a string containing the PVD's publisher id with trailing
blanks removed.
*/
const char *iso9660_get_publisher_id(const iso9660_pvd_t *pvd);
const char *iso9660_get_publisher_id(const iso9660_pvd_t *p_pvd);
uint8_t iso9660_get_pvd_type(const iso9660_pvd_t *pvd);
uint8_t iso9660_get_pvd_type(const iso9660_pvd_t *p_pvd);
const char * iso9660_get_pvd_id(const iso9660_pvd_t *pvd);
const char * iso9660_get_pvd_id(const iso9660_pvd_t *p_pvd);
int iso9660_get_pvd_space_size(const iso9660_pvd_t *pvd);
int iso9660_get_pvd_space_size(const iso9660_pvd_t *p_pvd);
int iso9660_get_pvd_block_size(const iso9660_pvd_t *pvd) ;
int iso9660_get_pvd_block_size(const iso9660_pvd_t *p_pvd) ;
/*! Return the primary volume id version number (of pvd).
If there is an error 0 is returned.
@@ -621,18 +621,18 @@ const char *iso9660_get_system_id(const iso9660_pvd_t *pvd);
/*! Return the LSN of the root directory for pvd.
If there is an error CDIO_INVALID_LSN is returned.
*/
lsn_t iso9660_get_root_lsn(const iso9660_pvd_t *pvd);
lsn_t iso9660_get_root_lsn(const iso9660_pvd_t *p_pvd);
/*!
Return the PVD's volume ID.
*/
const char *iso9660_get_volume_id(const iso9660_pvd_t *pvd);
const char *iso9660_get_volume_id(const iso9660_pvd_t *p_pvd);
/*!
Return the PVD's volumeset ID.
NULL is returned if there is some problem in getting this.
*/
const char *iso9660_get_volumeset_id(const iso9660_pvd_t *pvd);
const char *iso9660_get_volumeset_id(const iso9660_pvd_t *p_pvd);
/* pathtable */