From 9b0a90d4ae3c764c4c21572d6e0da2869a61bfe1 Mon Sep 17 00:00:00 2001
From: Pete Batard <pbatard@gmail.com>
Date: Mon, 5 Mar 2012 17:52:30 +0000
Subject: [PATCH] Fix various issues

* bzero is obsolete
* use HMODULE instead of long win win32 for 64 bit compatibility
* iso9660_seek_read_framesize fails seeking to a position higher than 4 GB
* cd-read produces a warning
* legal-regex should allow for years > 2009
---
 lib/driver/FreeBSD/freebsd_cam.c | 2 +-
 lib/driver/MSWindows/win32.c     | 2 +-
 lib/driver/MSWindows/win32.h     | 2 +-
 lib/iso9660/iso9660_fs.c         | 2 +-
 src/cd-read.c                    | 1 +
 test/check_legal.regex           | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/driver/FreeBSD/freebsd_cam.c b/lib/driver/FreeBSD/freebsd_cam.c
index df4c3923..1f17646e 100644
--- a/lib/driver/FreeBSD/freebsd_cam.c
+++ b/lib/driver/FreeBSD/freebsd_cam.c
@@ -317,7 +317,7 @@ static int sg_init_enumerator(burn_drive_enumerator_t *idx_)
     return -1;
   }
 
-  bzero(&(idx->ccb), sizeof(union ccb));
+  memset(&(idx->ccb), 0, sizeof(union ccb));
 
   idx->ccb.ccb_h.path_id = CAM_XPT_PATH_ID;
   idx->ccb.ccb_h.target_id = CAM_TARGET_WILDCARD;
diff --git a/lib/driver/MSWindows/win32.c b/lib/driver/MSWindows/win32.c
index 7aea24a2..fb6e2d7a 100644
--- a/lib/driver/MSWindows/win32.c
+++ b/lib/driver/MSWindows/win32.c
@@ -357,7 +357,7 @@ free_win32 (void *p_user_data)
   if( p_env->h_device_handle )
     CloseHandle( p_env->h_device_handle );
   if( p_env->hASPI )
-    FreeLibrary( (HMODULE)p_env->hASPI );
+    FreeLibrary( p_env->hASPI );
 
   free (p_env);
 }
diff --git a/lib/driver/MSWindows/win32.h b/lib/driver/MSWindows/win32.h
index e0eb5cee..2db99016 100644
--- a/lib/driver/MSWindows/win32.h
+++ b/lib/driver/MSWindows/win32.h
@@ -48,7 +48,7 @@ typedef struct {
   track_info_t  tocent[CDIO_CD_MAX_TRACKS+1];
 
   HANDLE h_device_handle; /* device descriptor */
-  long  hASPI;
+  HMODULE hASPI;
   short i_sid;
   short i_lun;
   long  (*lpSendCommand)( void* );
diff --git a/lib/iso9660/iso9660_fs.c b/lib/iso9660/iso9660_fs.c
index 224ec0ac..8ef2be43 100644
--- a/lib/iso9660/iso9660_fs.c
+++ b/lib/iso9660/iso9660_fs.c
@@ -681,7 +681,7 @@ iso9660_seek_read_framesize (const iso9660_t *p_iso, void *ptr,
 			     uint16_t i_framesize)
 {
   long int ret;
-  long int i_byte_offset;
+  int64_t i_byte_offset;
   
   if (!p_iso) return 0;
   i_byte_offset = (start * p_iso->i_framesize) + p_iso->i_fuzzy_offset 
diff --git a/src/cd-read.c b/src/cd-read.c
index 707e75d9..4e9a6bb1 100644
--- a/src/cd-read.c
+++ b/src/cd-read.c
@@ -591,6 +591,7 @@ main(int argc, char *argv[])
     else if (opts.output_file) {
       ssize_t bytes_ret;
       bytes_ret = write(output_fd, buffer, blocklen);
+      (void)bytes_ret; /* Silence unused warnings */
     } else {
       unsigned int i;
       for (i=0; i<blocklen; i++) printf("%c", buffer[i]);
diff --git a/test/check_legal.regex b/test/check_legal.regex
index ce3e402b..007b3462 100644
--- a/test/check_legal.regex
+++ b/test/check_legal.regex
@@ -1,5 +1,5 @@
 cd-info.* version [0-9]
-^Copyright (c) 200
+^Copyright (c) 20
 Bernstein
 ^This is free software; see the source for copying conditions\.$
 ^There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A$