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
This commit is contained in:
Pete Batard
2012-03-05 17:52:30 +00:00
parent 919f39a95d
commit 9b0a90d4ae
6 changed files with 6 additions and 5 deletions

View File

@@ -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;

View File

@@ -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);
}

View File

@@ -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* );

View File

@@ -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

View File

@@ -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]);

View File

@@ -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$