[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Libcdio-devel] two fixes to dev branch
From: |
Rocky Bernstein |
Subject: |
Re: [Libcdio-devel] two fixes to dev branch |
Date: |
Tue, 5 Dec 2017 17:52:00 -0500 |
The patches post have now been applied now in commit e86bdb7 in the dev
branch along with what I believe are the last set of memory-related
cleanups which adds another ISO9660 type for directory lists along with the
routines to create and free them.
Right now, I'm on track for a release around Dec 10.
On Tue, Dec 5, 2017 at 3:07 PM, Ozkan Sezer <address@hidden> wrote:
> 1. iso9660_filelist_free (and iso9660_filelist_new) not exported:
> iso-info.o: In function `print_iso9660_recurse':
> src/iso-info.c:299: undefined reference to `iso9660_filelist_free'
> src/iso-info.c:252: undefined reference to `iso9660_filelist_free'
> collect2: ld returned 1 exit status
>
> Adding iso9660_filelist_free() and iso9660_filelist_new() to
> libiso9660.sym fixes this:
>
> diff --git a/lib/iso9660/libiso9660.sym b/lib/iso9660/libiso9660.sym
> index 32f9c58..006182b 100644
> --- a/lib/iso9660/libiso9660.sym
> +++ b/lib/iso9660/libiso9660.sym
> @@ -13,6 +13,8 @@ iso9660_dir_init_new
> iso9660_dir_init_new_su
> iso9660_dir_to_name
> iso9660_dirname_valid_p
> +iso9660_filelist_new
> +iso9660_filelist_free
> iso9660_find_fs_lsn
> iso9660_fs_find_lsn
> iso9660_fs_find_lsn_with_path
>
>
>
> 2. bad HAVE_STRUCT_TM_TM_ZONE check in iso9660.c:
> iso9660.c: In function 'iso9660_get_dtime':
> iso9660.c:208:5: warning: "HAVE_STRUCT_TM_TM_ZONE" is not defined
> iso9660.c: In function 'iso9660_get_ltime':
> iso9660.c:280:5: warning: "HAVE_STRUCT_TM_TM_ZONE" is not defined
>
> Fixed by changing the if to ifdef:
>
> diff --git a/lib/iso9660/iso9660.c b/lib/iso9660/iso9660.c
> index b64e8bf..3f24f14 100644
> --- a/lib/iso9660/iso9660.c
> +++ b/lib/iso9660/iso9660.c
> @@ -205,7 +205,7 @@ iso9660_get_dtime (const iso9660_dtime_t
> *idr_date, bool b_localtime,
> p_tm->tm_sec = idr_date->dt_second - idr_date->dt_gmtoff * (15 * 60);
> p_tm->tm_isdst = -1; /* information not available */
>
> -#if HAVE_STRUCT_TM_TM_ZONE == 1
> +#ifdef HAVE_STRUCT_TM_TM_ZONE
> /* Initialize everything */
> p_tm->tm_zone = 0;
> #endif
> @@ -277,7 +277,7 @@ iso9660_get_ltime (const iso9660_ltime_t *p_ldate,
> #ifndef HAVE_TM_GMTOFF
> p_tm->tm_sec += p_ldate->lt_gmtoff * (15 * 60);
> #endif
> -#if HAVE_STRUCT_TM_TM_ZONE == 1
> +#ifdef HAVE_STRUCT_TM_TM_ZONE
> /* Initialize everything */
> p_tm->tm_zone = 0;
> #endif
>
>
> --
> O.S.
>
>