| author | R. Bernstein <rocky@gnu.org> | 2024年01月09日 02:21:19 -0500 |
|---|---|---|
| committer | R. Bernstein <rocky@gnu.org> | 2024年01月09日 02:21:19 -0500 |
| commit | 4ebc31bf828e3503891a201ecb6ef7e92ac52359 (patch) | |
| tree | a86680695bd937effafefc390fae76b5764e54f3 | |
| parent | 5f797b27d1b73815f27c03e8ee9074e35e37f0e2 (diff) | |
| download | libcdio-nvinsion234.tar.gz | |
| -rw-r--r-- | include/cdio/iso9660.h | 4 | ||||
| -rw-r--r-- | lib/driver/libcdio.sym | 8 | ||||
| -rw-r--r-- | lib/iso9660/iso9660_fs.c | 9 |
diff --git a/include/cdio/iso9660.h b/include/cdio/iso9660.h index f5eb09e2..4fa12bda 100644 --- a/include/cdio/iso9660.h +++ b/include/cdio/iso9660.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2003-2008, 2012-2013, 2017, 2023 + Copyright (C) 2003-2008, 2012-2013, 2017, 2023-2024 Rocky Bernstein <rocky@gnu.org> Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org> @@ -910,8 +910,8 @@ iso9660_dir_calc_record_size (unsigned int namelen, unsigned int su_len); @return stat_t of entry if we found lsn, or NULL otherwise. Caller must free return value using iso9660_stat_free(). */ -#define iso9660_fs_find_lsn iso9660_find_fs_lsn iso9660_stat_t *iso9660_fs_find_lsn(CdIo_t *p_cdio, lsn_t i_lsn); +iso9660_stat_t *iso9660_find_fs_lsn(CdIo_t *p_cdio, lsn_t i_lsn); /*! diff --git a/lib/driver/libcdio.sym b/lib/driver/libcdio.sym index 9143ccf5..7d757af9 100644 --- a/lib/driver/libcdio.sym +++ b/lib/driver/libcdio.sym @@ -48,7 +48,6 @@ cdio_get_cdtext cdio_get_cdtext_raw cdio_get_default_device cdio_get_default_device_bincue -cdio_get_default_device_bsdi cdio_get_default_device_cdrdao cdio_get_default_device_driver cdio_get_default_device_freebsd @@ -59,7 +58,6 @@ cdio_get_default_device_solaris cdio_get_default_device_win32 cdio_get_devices cdio_get_devices_bincue -cdio_get_devices_bsdi cdio_get_devices_cdrdao cdio_get_devices_freebsd cdio_get_devices_linux @@ -101,7 +99,6 @@ cdio_get_track_sec_count cdio_guess_cd_type cdio_have_atapi cdio_have_bincue -cdio_have_bsdi cdio_have_cdrdao cdio_have_driver cdio_have_freebsd @@ -135,7 +132,6 @@ cdio_msf_to_str cdio_open cdio_open_am cdio_open_am_bincue -cdio_open_am_bsdi cdio_open_am_cd cdio_open_am_cdrdao cdio_open_am_freebsd @@ -146,7 +142,6 @@ cdio_open_am_osx cdio_open_am_solaris cdio_open_am_win32 cdio_open_bincue -cdio_open_bsdi cdio_open_cd cdio_open_cdrdao cdio_open_cue @@ -171,7 +166,6 @@ cdio_read_sectors cdio_realpath cdio_set_arg cdio_set_blocksize -cdio_set_drive_speed cdio_set_speed cdio_stdio_destroy cdio_stdio_new @@ -224,7 +218,6 @@ mmc_get_drive_mmc_cap mmc_get_dvd_struct_physical mmc_get_event_status mmc_get_hwinfo -mmc_get_last_lsn mmc_get_mcn mmc_get_media_changed mmc_get_track_isrc @@ -236,7 +229,6 @@ mmc_is_disctype_cdrom mmc_is_disctype_dvd mmc_is_disctype_hd_dvd mmc_is_disctype_overwritable -mmc_isrc_track_read_subchannel mmc_last_cmd_sense mmc_mode_select_10 mmc_mode_sense diff --git a/lib/iso9660/iso9660_fs.c b/lib/iso9660/iso9660_fs.c index f18a2a16..e5b8fa43 100644 --- a/lib/iso9660/iso9660_fs.c +++ b/lib/iso9660/iso9660_fs.c @@ -1,5 +1,6 @@ /* - Copyright (C) 2003-2008, 2011-2015, 2017 Rocky Bernstein <rocky@gnu.org> + Copyright (C) 2003-2008, 2011-2015, 2017, 2024 + Rocky Bernstein <rocky@gnu.org> Copyright (C) 2018, 2020 Pete Batard <pete@akeo.ie> Copyright (C) 2018 Thomas Schmitt <scdbackup@gmx.net> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> @@ -796,7 +797,7 @@ _iso9660_is_rock_ridge_enabled(void* p_image) /*! Convert a directory record name to a 0-terminated string. One of parameters alloc_result and cpy_result should be non-NULL to take - the result. + the result. */ static bool _iso9660_recname_to_cstring(const char *src, size_t src_len, @@ -1234,7 +1235,7 @@ _fs_iso_stat_traverse (iso9660_t *p_iso, const iso9660_stat_t *_root, { unsigned offset = 0; uint8_t *_dirbuf = NULL; - uint32_t blocks; + uint32_t blocks; int ret, cmp; iso9660_stat_t *p_stat = NULL; iso9660_dir_t *p_iso9660_dir = NULL; @@ -1775,6 +1776,8 @@ iso9660_fs_find_lsn(CdIo_t *p_cdio, lsn_t i_lsn) free(psz_full_filename); return p_statbuf; } +iso9660_stat_t * +iso9660_find_fs_lsn(CdIo_t *p_cdio, lsn_t i_lsn) __attribute__ ((alias ("iso9660_fs_find_lsn"))); /*! Given a directory pointer, find the filesystem entry that contains |