From 9fc59956e90400fbf2960f10ca3cb48b54131e1f Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Sun, 31 Aug 2003 03:35:36 +0000
Subject: [PATCH] cd_types: tighter use of ISO #defines. Make some of the
 private ones public to reduce "private" use in vcdimager.

---
 include/cdio/iso9660.h | 11 ++++++-----
 lib/cd_types.c         | 10 +++++-----
 lib/iso9660_private.h  |  5 +----
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/include/cdio/iso9660.h b/include/cdio/iso9660.h
index 557e3734..11609fd1 100644
--- a/include/cdio/iso9660.h
+++ b/include/cdio/iso9660.h
@@ -1,5 +1,5 @@
 /*
-    $Id: iso9660.h,v 1.5 2003/08/31 02:51:41 rocky Exp $
+    $Id: iso9660.h,v 1.6 2003/08/31 03:35:36 rocky Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -29,7 +29,6 @@
 
 #define MIN_ISO_SIZE MIN_TRACK_SIZE
 
-#define ISO_BLOCKSIZE 2048
 
 #define LEN_ISONAME     31
 #define MAX_ISONAME     37
@@ -39,12 +38,14 @@
 #define ISO_FILE        0       
 #define ISO_VD_PRIMARY  1
 #define ISO_DIRECTORY   2
-#define ISO_STANDARD_ID         "CD001"
-
-
 #define ISO_PVD_SECTOR  16
 #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 {
   ISO9660_NOCHECK = 0,
   ISO9660_7BIT,
diff --git a/lib/cd_types.c b/lib/cd_types.c
index f98ee970..084e65a9 100644
--- a/lib/cd_types.c
+++ b/lib/cd_types.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cd_types.c,v 1.1 2003/08/17 05:31:19 rocky Exp $
+    $Id: cd_types.c,v 1.2 2003/08/31 03:35:36 rocky Exp $
 
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
 
@@ -40,6 +40,7 @@
 #endif
 
 #include <cdio/cdio.h>
+#include <cdio/iso9660.h>
 #include <cdio/logging.h>
 #include <cdio/util.h>
 #include <cdio/cd_types.h>
@@ -62,7 +63,6 @@ and
 static char buffer[6][CDIO_CD_FRAMESIZE_RAW];  /* for CD-Data */
 
 /* Some interesting sector numbers stored in the above buffer. */
-#define ISO_SUPERBLOCK_SECTOR  16  /* buffer[0] */
 #define UFS_SUPERBLOCK_SECTOR   4  /* buffer[2] */
 #define BOOT_SECTOR            17  /* buffer[3] */
 #define VCD_INFO_SECTOR       150  /* buffer[4] */
@@ -79,13 +79,13 @@ typedef struct signature
 static signature_t sigs[] =
   {
 /*buffer[x] off look for     description */
-    {0,     1, "CD001",      "ISO 9660"}, 
+    {0,     1, ISO_STANDARD_ID,      "ISO 9660"}, 
     {0,     1, "CD-I",       "CD-I"}, 
     {0,     8, "CDTV",       "CDTV"}, 
     {0,     8, "CD-RTOS",    "CD-RTOS"}, 
     {0,     9, "CDROM",      "HIGH SIERRA"}, 
     {0,    16, "CD-BRIDGE",  "BRIDGE"}, 
-    {0,  1024, "CD-XA001",   "XA"}, 
+    {0,  ISO_XA_MARKER_OFFSET, ISO_XA_MARKER_STRING,   "XA"}, 
     {1,    64, "PPPPHHHHOOOOTTTTOOOO____CCCCDDDD",  "PHOTO CD"}, 
     {1, 0x438, "\x53\xef",   "EXT2 FS"}, 
     {2,  1372, "\x54\x19\x01\x0", "UFS"}, 
@@ -211,7 +211,7 @@ cdio_guess_cd_type(/*in*/ CdIo *cdio, int start_session, track_t track_num,
 {
   int ret = 0;
   
-  if ( _cdio_read_block(cdio, ISO_SUPERBLOCK_SECTOR, start_session, 
+  if ( _cdio_read_block(cdio, ISO_PVD_SECTOR, start_session, 
 			0, track_num) < 0 )
     return CDIO_FS_UNKNOWN;
   
diff --git a/lib/iso9660_private.h b/lib/iso9660_private.h
index 605ac8bf..75739d4a 100644
--- a/lib/iso9660_private.h
+++ b/lib/iso9660_private.h
@@ -1,5 +1,5 @@
 /*
-    $Id: iso9660_private.h,v 1.2 2003/08/29 02:38:07 rocky Exp $
+    $Id: iso9660_private.h,v 1.3 2003/08/31 03:35:36 rocky Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -28,9 +28,6 @@
 
 #define ISO_VERSION             1
 
-#define ISO_XA_MARKER_STRING    "CD-XA001"
-#define ISO_XA_MARKER_OFFSET    1024
-
 PRAGMA_BEGIN_PACKED
 
 struct iso_volume_descriptor {