diff --git a/example/sample3.c b/example/sample3.c index 3838ad87..b4d33b23 100644 --- a/example/sample3.c +++ b/example/sample3.c @@ -1,5 +1,5 @@ /* - $Id: sample3.c,v 1.5 2003/10/03 08:36:39 rocky Exp $ + $Id: sample3.c,v 1.6 2003/11/05 04:12:57 rocky Exp $ Copyright (C) 2003 Rocky Bernstein @@ -32,7 +32,7 @@ #include static void -print_analysis(cdio_analysis_t cdio_analysis, +print_analysis(cdio_iso_analysis_t cdio_iso_analysis, cdio_fs_anal_t fs, int first_data, unsigned int num_audio, track_t num_tracks, track_t first_track_num, CdIo *cdio) { @@ -42,7 +42,7 @@ print_analysis(cdio_analysis_t cdio_analysis, case CDIO_FS_ISO_9660: printf("CD-ROM with ISO 9660 filesystem"); if (fs & CDIO_FS_ANAL_JOLIET) { - printf(" and joliet extension level %d", cdio_analysis.joliet_level); + printf(" and joliet extension level %d", cdio_iso_analysis.joliet_level); } if (fs & CDIO_FS_ANAL_ROCKRIDGE) printf(" and rockridge extensions"); @@ -81,7 +81,7 @@ print_analysis(cdio_analysis_t cdio_analysis, case CDIO_FS_ISO_9660_INTERACTIVE: case CDIO_FS_ISO_HFS: printf("ISO 9660: %i blocks, label `%.32s'\n", - cdio_analysis.isofs_size, cdio_analysis.iso_label); + cdio_iso_analysis.isofs_size, cdio_iso_analysis.iso_label); break; } if (first_data == 1 && num_audio > 0) @@ -153,9 +153,9 @@ main(int argc, const char *argv[]) } else { /* we have data track(s) */ int j; - cdio_analysis_t cdio_analysis; + cdio_iso_analysis_t cdio_iso_analysis; - memset(&cdio_analysis, 0, sizeof(cdio_analysis)); + memset(&cdio_iso_analysis, 0, sizeof(cdio_iso_analysis)); for (j = 2, i = first_data; i <= num_tracks; i++) { lsn_t lsn; @@ -181,12 +181,12 @@ main(int argc, const char *argv[]) data_start = start_track; /* skip tracks which belong to the current walked session */ - if (start_track < data_start + cdio_analysis.isofs_size) + if (start_track < data_start + cdio_iso_analysis.isofs_size) continue; - fs = cdio_guess_cd_type(cdio, start_track, i, &cdio_analysis); + fs = cdio_guess_cd_type(cdio, start_track, i, &cdio_iso_analysis); - print_analysis(cdio_analysis, fs, first_data, num_audio, + print_analysis(cdio_iso_analysis, fs, first_data, num_audio, num_tracks, first_track_num, cdio); if ( !(CDIO_FSTYPE(fs) == CDIO_FS_ISO_9660 || diff --git a/example/sample4.c b/example/sample4.c index f102ecd0..9ac929ad 100644 --- a/example/sample4.c +++ b/example/sample4.c @@ -1,5 +1,5 @@ /* - $Id: sample4.c,v 1.3 2003/10/03 01:42:47 rocky Exp $ + $Id: sample4.c,v 1.4 2003/11/05 04:12:58 rocky Exp $ Copyright (C) 2003 Rocky Bernstein @@ -45,7 +45,7 @@ log_handler (cdio_log_level_t level, const char message[]) } static void -print_analysis(cdio_analysis_t cdio_analysis, +print_analysis(cdio_iso_analysis_t cdio_iso_analysis, cdio_fs_anal_t fs, int first_data, unsigned int num_audio, track_t num_tracks, track_t first_track_num, CdIo *cdio) { @@ -55,7 +55,7 @@ print_analysis(cdio_analysis_t cdio_analysis, case CDIO_FS_ISO_9660: printf("CD-ROM with ISO 9660 filesystem"); if (fs & CDIO_FS_ANAL_JOLIET) { - printf(" and joliet extension level %d", cdio_analysis.joliet_level); + printf(" and joliet extension level %d", cdio_iso_analysis.joliet_level); } if (fs & CDIO_FS_ANAL_ROCKRIDGE) printf(" and rockridge extensions"); @@ -94,7 +94,7 @@ print_analysis(cdio_analysis_t cdio_analysis, case CDIO_FS_ISO_9660_INTERACTIVE: case CDIO_FS_ISO_HFS: printf("ISO 9660: %i blocks, label `%.32s'\n", - cdio_analysis.isofs_size, cdio_analysis.iso_label); + cdio_iso_analysis.isofs_size, cdio_iso_analysis.iso_label); break; } if (first_data == 1 && num_audio > 0) @@ -174,9 +174,9 @@ main(int argc, const char *argv[]) } else { /* we have data track(s) */ int j; - cdio_analysis_t cdio_analysis; + cdio_iso_analysis_t cdio_iso_analysis; - memset(&cdio_analysis, 0, sizeof(cdio_analysis)); + memset(&cdio_iso_analysis, 0, sizeof(cdio_iso_analysis)); for (j = 2, i = first_data; i <= num_tracks; i++) { lsn_t lsn; @@ -202,12 +202,12 @@ main(int argc, const char *argv[]) data_start = start_track; /* skip tracks which belong to the current walked session */ - if (start_track < data_start + cdio_analysis.isofs_size) + if (start_track < data_start + cdio_iso_analysis.isofs_size) continue; - fs = cdio_guess_cd_type(cdio, start_track, i, &cdio_analysis); + fs = cdio_guess_cd_type(cdio, start_track, i, &cdio_iso_analysis); - print_analysis(cdio_analysis, fs, first_data, num_audio, + print_analysis(cdio_iso_analysis, fs, first_data, num_audio, num_tracks, first_track_num, cdio); if ( !(CDIO_FSTYPE(fs) == CDIO_FS_ISO_9660 || diff --git a/include/cdio/cd_types.h b/include/cdio/cd_types.h index e41de63e..4d0bb74c 100644 --- a/include/cdio/cd_types.h +++ b/include/cdio/cd_types.h @@ -1,5 +1,5 @@ /* - $Id: cd_types.h,v 1.5 2003/11/04 12:28:08 rocky Exp $ + $Id: cd_types.h,v 1.6 2003/11/05 04:12:58 rocky Exp $ Copyright (C) 2003 Rocky Bernstein Copyright (C) 1996,1997,1998 Gerd Knorr @@ -110,7 +110,7 @@ typedef struct char iso_label[33]; /**< This is 32 + 1 for null byte at the end in formatting the string */ unsigned int isofs_size; -} cdio_analysis_t; +} cdio_iso_analysis_t; /** * Try to determine what kind of CD-image and/or filesystem we @@ -119,7 +119,7 @@ typedef struct */ cdio_fs_anal_t cdio_guess_cd_type(const CdIo *cdio, int start_session, track_t track_num, - /*out*/ cdio_analysis_t *cdio_analysis); + /*out*/ cdio_iso_analysis_t *iso_analysis); #ifdef __cplusplus } diff --git a/lib/cd_types.c b/lib/cd_types.c index 07fad547..59c5fba3 100644 --- a/lib/cd_types.c +++ b/lib/cd_types.c @@ -1,5 +1,5 @@ /* - $Id: cd_types.c,v 1.6 2003/10/06 04:04:05 rocky Exp $ + $Id: cd_types.c,v 1.7 2003/11/05 04:12:58 rocky Exp $ Copyright (C) 2003 Rocky Bernstein @@ -208,7 +208,7 @@ _cdio_get_joliet_level( void ) */ cdio_fs_anal_t cdio_guess_cd_type(const CdIo *cdio, int start_session, track_t track_num, - /*out*/ cdio_analysis_t *cdio_analysis) + /*out*/ cdio_iso_analysis_t *iso_analysis) { int ret = 0; bool sector0_read_ok; @@ -239,8 +239,8 @@ cdio_guess_cd_type(const CdIo *cdio, int start_session, track_t track_num, ret = CDIO_FS_ISO_HFS; else ret = CDIO_FS_ISO_9660; - cdio_analysis->isofs_size = _cdio_get_iso9660_fs_sec_count(); - sprintf(cdio_analysis->iso_label, buffer[0]+40); + iso_analysis->isofs_size = _cdio_get_iso9660_fs_sec_count(); + sprintf(iso_analysis->iso_label, buffer[0]+40); #if 0 if (_cdio_is_rockridge()) @@ -251,7 +251,7 @@ cdio_guess_cd_type(const CdIo *cdio, int start_session, track_t track_num, return ret; if (_cdio_is_joliet()) { - cdio_analysis->joliet_level = _cdio_get_joliet_level(); + iso_analysis->joliet_level = _cdio_get_joliet_level(); ret |= CDIO_FS_ANAL_JOLIET; } if (_cdio_is_it(INDEX_BOOTABLE)) diff --git a/lib/cdio.c b/lib/cdio.c index 8b64be11..ead3f6d5 100644 --- a/lib/cdio.c +++ b/lib/cdio.c @@ -1,5 +1,5 @@ /* - $Id: cdio.c,v 1.36 2003/10/04 23:12:22 rocky Exp $ + $Id: cdio.c,v 1.37 2003/11/05 04:12:58 rocky Exp $ Copyright (C) 2003 Rocky Bernstein Copyright (C) 2001 Herbert Valerio Riedel @@ -37,7 +37,7 @@ #include #include "cdio_private.h" -static const char _rcsid[] = "$Id: cdio.c,v 1.36 2003/10/04 23:12:22 rocky Exp $"; +static const char _rcsid[] = "$Id: cdio.c,v 1.37 2003/11/05 04:12:58 rocky Exp $"; const char *track_format2str[6] = @@ -346,9 +346,9 @@ cdio_get_devices_with_cap (char* search_devices[], if (NULL != cdio) { track_t first_track = cdio_get_first_track_num(cdio); - cdio_analysis_t cdio_analysis; + cdio_iso_analysis_t cdio_iso_analysis; got_fs = cdio_guess_cd_type(cdio, 0, first_track, - &cdio_analysis); + &cdio_iso_analysis); /* Match on fs and add */ if ( (CDIO_FS_UNKNOWN == need_fs || CDIO_FSTYPE(got_fs) == need_fs) ) { diff --git a/src/cd-info.c b/src/cd-info.c index 14edf490..20d8e67f 100644 --- a/src/cd-info.c +++ b/src/cd-info.c @@ -1,5 +1,5 @@ /* - $Id: cd-info.c,v 1.43 2003/10/15 01:59:51 rocky Exp $ + $Id: cd-info.c,v 1.44 2003/11/05 04:12:58 rocky Exp $ Copyright (C) 2003 Rocky Bernstein Copyright (C) 1996,1997,1998 Gerd Knorr @@ -591,7 +591,7 @@ print_iso9660_fs (CdIo *cdio, cdio_fs_anal_t fs, track_format_t track_format) } static void -print_analysis(int ms_offset, cdio_analysis_t cdio_analysis, +print_analysis(int ms_offset, cdio_iso_analysis_t cdio_iso_analysis, cdio_fs_anal_t fs, int first_data, unsigned int num_audio, track_t num_tracks, track_t first_track_num, track_format_t track_format, CdIo *cdio) @@ -611,7 +611,7 @@ print_analysis(int ms_offset, cdio_analysis_t cdio_analysis, case CDIO_FS_ISO_9660: printf("CD-ROM with ISO 9660 filesystem"); if (fs & CDIO_FS_ANAL_JOLIET) { - printf(" and joliet extension level %d", cdio_analysis.joliet_level); + printf(" and joliet extension level %d", cdio_iso_analysis.joliet_level); } if (fs & CDIO_FS_ANAL_ROCKRIDGE) printf(" and rockridge extensions"); @@ -650,7 +650,7 @@ print_analysis(int ms_offset, cdio_analysis_t cdio_analysis, case CDIO_FS_ISO_9660_INTERACTIVE: case CDIO_FS_ISO_HFS: printf("ISO 9660: %i blocks, label `%.32s'\n", - cdio_analysis.isofs_size, cdio_analysis.iso_label); + cdio_iso_analysis.isofs_size, cdio_iso_analysis.iso_label); if (opts.print_iso9660) print_iso9660_fs(cdio, fs, track_format); break; @@ -731,22 +731,22 @@ int main(int argc, const char *argv[]) { - CdIo *cdio=NULL; - cdio_fs_anal_t fs=CDIO_FS_AUDIO; + CdIo *cdio=NULL; + cdio_fs_anal_t fs=CDIO_FS_AUDIO; int i; - lsn_t start_track_lsn; /* lsn of first track */ - lsn_t data_start =0; /* start of data area */ - int ms_offset = 0; - track_t num_tracks=0; - track_t first_track_num = 0; - unsigned int num_audio = 0; /* # of audio tracks */ - unsigned int num_data = 0; /* # of data tracks */ - int first_data = -1; /* # of first data track */ - int first_audio = -1; /* # of first audio track */ - cdio_analysis_t cdio_analysis; - char *media_catalog_number; + lsn_t start_track_lsn; /* lsn of first track */ + lsn_t data_start =0; /* start of data area */ + int ms_offset = 0; + track_t num_tracks=0; + track_t first_track_num = 0; + unsigned int num_audio = 0; /* # of audio tracks */ + unsigned int num_data = 0; /* # of data tracks */ + int first_data = -1; /* # of first data track */ + int first_audio = -1; /* # of first audio track */ + cdio_iso_analysis_t cdio_iso_analysis; + char *media_catalog_number; - memset(&cdio_analysis, 0, sizeof(cdio_analysis)); + memset(&cdio_iso_analysis, 0, sizeof(cdio_iso_analysis)); init(); /* Parse our arguments; every option seen by `parse_opt' will @@ -942,7 +942,7 @@ main(int argc, const char *argv[]) /* CD-I/Ready says start_track_lsn <= 30*75 then CDDA */ if (start_track_lsn > 100 /* 100 is just a guess */) { - fs = cdio_guess_cd_type(cdio, 0, 1, &cdio_analysis); + fs = cdio_guess_cd_type(cdio, 0, 1, &cdio_iso_analysis); if ((CDIO_FSTYPE(fs)) != CDIO_FS_UNKNOWN) fs |= CDIO_FS_ANAL_HIDDEN_TRACK; else { @@ -952,7 +952,7 @@ main(int argc, const char *argv[]) (long unsigned int) start_track_lsn); } } - print_analysis(ms_offset, cdio_analysis, fs, first_data, num_audio, + print_analysis(ms_offset, cdio_iso_analysis, fs, first_data, num_audio, num_tracks, first_track_num, cdio_get_track_format(cdio, 1), cdio); } else { @@ -983,10 +983,10 @@ main(int argc, const char *argv[]) data_start = start_track_lsn; /* skip tracks which belong to the current walked session */ - if (start_track_lsn < data_start + cdio_analysis.isofs_size) + if (start_track_lsn < data_start + cdio_iso_analysis.isofs_size) continue; - fs = cdio_guess_cd_type(cdio, start_track_lsn, i, &cdio_analysis); + fs = cdio_guess_cd_type(cdio, start_track_lsn, i, &cdio_iso_analysis); if (i > 1) { /* track is beyond last session -> new session found */ @@ -994,13 +994,14 @@ main(int argc, const char *argv[]) printf("session #%d starts at track %2i, LSN: %lu," " ISO 9660 blocks: %6i\n", j++, i, (unsigned long int) start_track_lsn, - cdio_analysis.isofs_size); + cdio_iso_analysis.isofs_size); printf("ISO 9660: %i blocks, label `%.32s'\n", - cdio_analysis.isofs_size, cdio_analysis.iso_label); + cdio_iso_analysis.isofs_size, cdio_iso_analysis.iso_label); fs |= CDIO_FS_ANAL_MULTISESSION; } else { - print_analysis(ms_offset, cdio_analysis, fs, first_data, num_audio, - num_tracks, first_track_num, track_format, cdio); + print_analysis(ms_offset, cdio_iso_analysis, fs, first_data, + num_audio, num_tracks, first_track_num, + track_format, cdio); } if ( !(CDIO_FSTYPE(fs) == CDIO_FS_ISO_9660 ||