From 00fba6a2c03b80e5f0f612e90c543c58ba02859f Mon Sep 17 00:00:00 2001 From: rocky Date: Sun, 6 Nov 2005 19:15:43 +0000 Subject: [PATCH] Return type of iso9660_get_posix_mode should be mode_t (the OS-specific version), not posix_mode_t (cdio's internally consistent version. --- include/cdio/iso9660.h | 4 ++-- lib/iso9660/iso9660.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/cdio/iso9660.h b/include/cdio/iso9660.h index 23a0f8b3..b6f865cc 100644 --- a/include/cdio/iso9660.h +++ b/include/cdio/iso9660.h @@ -1,5 +1,5 @@ /* - $Id: iso9660.h,v 1.78 2005/11/06 00:39:37 rocky Exp $ + $Id: iso9660.h,v 1.79 2005/11/06 19:15:43 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel Copyright (C) 2003, 2004, 2005 Rocky Bernstein @@ -871,7 +871,7 @@ lsn_t iso9660_get_dir_extent(const iso9660_dir_t *p_idr); /*! Returns a POSIX mode for a given p_udf_dirent. */ - posix_mode_t iso9660_get_posix_filemode(const iso9660_stat_t *p_iso_dirent); + mode_t iso9660_get_posix_filemode(const iso9660_stat_t *p_iso_dirent); /*! Return a string containing the preparer id with trailing diff --git a/lib/iso9660/iso9660.c b/lib/iso9660/iso9660.c index a5a2f042..1e81b839 100644 --- a/lib/iso9660/iso9660.c +++ b/lib/iso9660/iso9660.c @@ -1,5 +1,5 @@ /* - $Id: iso9660.c,v 1.15 2005/11/06 00:39:37 rocky Exp $ + $Id: iso9660.c,v 1.16 2005/11/06 19:15:43 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel Copyright (C) 2003, 2004, 2005 Rocky Bernstein @@ -51,7 +51,7 @@ const char ISO_STANDARD_ID[] = {'C', 'D', '0', '0', '1'}; #include #endif -static const char _rcsid[] = "$Id: iso9660.c,v 1.15 2005/11/06 00:39:37 rocky Exp $"; +static const char _rcsid[] = "$Id: iso9660.c,v 1.16 2005/11/06 19:15:43 rocky Exp $"; /* Variables to hold debugger-helping enumerations */ enum iso_enum1_s iso_enums1; @@ -690,10 +690,10 @@ iso9660_pathtable_init (void *pt) /*! Returns POSIX mode bitstring for a given file. */ -posix_mode_t +mode_t iso9660_get_posix_filemode(const iso9660_stat_t *p_iso_dirent) { - posix_mode_t mode = 0; + mode_t mode = 0; if (yep == p_iso_dirent->rr.b3_rock) { return iso9660_get_posix_filemode_from_rock(&p_iso_dirent->rr);