claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

cd_types: tighter use of ISO #defines.

Browse Source 
Make some of the private ones public to reduce "private" use in vcdimager.
This commit is contained in:
rocky
2003-08-31 03:35:36 +00:00
parent 312a918ef8
commit 9fc59956e9
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/cdio/iso9660.h
View File

@@ -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) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -29,7 +29,6 @@
#define MIN_ISO_SIZE MIN_TRACK_SIZE #define MIN_ISO_SIZE MIN_TRACK_SIZE
#define ISO_BLOCKSIZE 2048
#define LEN_ISONAME 31 #define LEN_ISONAME 31
#define MAX_ISONAME 37 #define MAX_ISONAME 37
@@ -39,12 +38,14 @@
#define ISO_FILE 0 #define ISO_FILE 0
#define ISO_VD_PRIMARY 1 #define ISO_VD_PRIMARY 1
#define ISO_DIRECTORY 2 #define ISO_DIRECTORY 2
#define ISO_STANDARD_ID "CD001"
#define ISO_PVD_SECTOR 16 #define ISO_PVD_SECTOR 16
#define ISO_EVD_SECTOR 17 #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 { enum strncpy_pad_check {
ISO9660_NOCHECK = 0, ISO9660_NOCHECK = 0,
ISO9660_7BIT, ISO9660_7BIT,

10
lib/cd_types.c
View File

@@ -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> Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -40,6 +40,7 @@
#endif #endif
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/iso9660.h>
#include <cdio/logging.h> #include <cdio/logging.h>
#include <cdio/util.h> #include <cdio/util.h>
#include <cdio/cd_types.h> #include <cdio/cd_types.h>
@@ -62,7 +63,6 @@ and
static char buffer[6][CDIO_CD_FRAMESIZE_RAW]; /* for CD-Data */ static char buffer[6][CDIO_CD_FRAMESIZE_RAW]; /* for CD-Data */
/* Some interesting sector numbers stored in the above buffer. */ /* Some interesting sector numbers stored in the above buffer. */
#define ISO_SUPERBLOCK_SECTOR 16 /* buffer[0] */
#define UFS_SUPERBLOCK_SECTOR 4 /* buffer[2] */ #define UFS_SUPERBLOCK_SECTOR 4 /* buffer[2] */
#define BOOT_SECTOR 17 /* buffer[3] */ #define BOOT_SECTOR 17 /* buffer[3] */
#define VCD_INFO_SECTOR 150 /* buffer[4] */ #define VCD_INFO_SECTOR 150 /* buffer[4] */
@@ -79,13 +79,13 @@ typedef struct signature
static signature_t sigs[] = static signature_t sigs[] =
{ {
/*buffer[x] off look for description */ /*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, 1, "CD-I", "CD-I"},
{0, 8, "CDTV", "CDTV"}, {0, 8, "CDTV", "CDTV"},
{0, 8, "CD-RTOS", "CD-RTOS"}, {0, 8, "CD-RTOS", "CD-RTOS"},
{0, 9, "CDROM", "HIGH SIERRA"}, {0, 9, "CDROM", "HIGH SIERRA"},
{0, 16, "CD-BRIDGE", "BRIDGE"}, {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, 64, "PPPPHHHHOOOOTTTTOOOO____CCCCDDDD", "PHOTO CD"},
{1, 0x438, "\x53\xef", "EXT2 FS"}, {1, 0x438, "\x53\xef", "EXT2 FS"},
{2, 1372, "\x54\x19\x01\x0", "UFS"}, {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; 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 ) 0, track_num) < 0 )
return CDIO_FS_UNKNOWN; return CDIO_FS_UNKNOWN;

5
lib/iso9660_private.h
View File

@@ -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) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -28,9 +28,6 @@
#define ISO_VERSION 1 #define ISO_VERSION 1
#define ISO_XA_MARKER_STRING "CD-XA001"
#define ISO_XA_MARKER_OFFSET 1024
PRAGMA_BEGIN_PACKED PRAGMA_BEGIN_PACKED
struct iso_volume_descriptor { struct iso_volume_descriptor {