Final tidy up.

include/cdio/iso9660.h

@@ -1,5 +1,5 @@
 /*
-    $Id: iso9660.h,v 1.10 2003/08/31 08:32:40 rocky Exp $
+    $Id: iso9660.h,v 1.11 2003/08/31 09:11:25 rocky Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -22,8 +22,6 @@
 #ifndef __CDIO_ISO9660_H__
 #define __CDIO_ISO9660_H__
 
-/* Will eventually need/use glib.h */
-
 #include <cdio/cdio.h>
 #include <cdio/xa.h>
 
@@ -44,8 +42,6 @@
 #define ISO_EVD_SECTOR  17
 
 #define ISO_STANDARD_ID         "CD001"
-#define ISO_XA_MARKER_STRING    "CD-XA001"
-#define ISO_XA_MARKER_OFFSET    1024
 #define ISO_BLOCKSIZE           2048
 
 enum strncpy_pad_check {
@@ -224,44 +220,7 @@ uint16_t
 iso9660_pathtable_m_add_entry (void *pt, const char name[], uint32_t extent,
                        uint16_t parent);
 
-/*!
-  Returns a string which interpreting the extended attribute xa_attr. 
-  For example:
-  \verbatim
-  d---1xrxrxr
-  ---2--r-r-r
-  -a--1xrxrxr
-  \endverbatim
-  
-  A description of the characters in the string follows
-  The 1st character is either "d" if the entry is a directory, or "-" if not
-  The 2nd character is either "a" if the entry is CDDA (audio), or "-" if not
-  The 3rd character is either "i" if the entry is interleaved, or "-" if not
-  The 4th character is either "2" if the entry is mode2 form2 or "-" if not
-  The 5th character is either "1" if the entry is mode2 form1 or "-" if not
-  Note that an entry will either be in mode2 form1 or mode form2. That
-  is you will either see "2-" or "-1" in the 4th & 5th positions.
-  
-  The 6th and 7th characters refer to permissions for everyone while the
-  the 8th and 9th characters refer to permissions for a group while, and 
-  the 10th and 11th characters refer to permissions for a user. 
-  
-  In each of these pairs the first character (6, 8, 10) is "x" if the 
-  entry is executable. For a directory this means the directory is
-  allowed to be listed or "searched".
-  The second character of a pair (7, 9, 11) is "r" if the entry is allowed
-  to be read. 
-*/
-const char *
-iso9660_get_xa_attr_str (uint16_t xa_attr);
-  
-iso9660_xa_t *
-iso9660_xa_init (iso9660_xa_t *_xa, uint16_t uid, uint16_t gid, uint16_t attr, 
-                 uint8_t filenum);
-
-
 #endif /* __CDIO_ISO9660_H__ */
-
 
 /* 
  * Local variables: