claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

More patches from pbatard to reduce warnings, etc.

Browse Source
This commit is contained in:
R. Bernstein
2012-03-03 20:11:14 -05:00
parent d0018220cc
commit 2022037807
13 changed files with 134 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/driver/image/bincue.c
View File

@@ -59,7 +59,7 @@
#include <ctype.h>
#include "filemode.h"
#include "portable.h"
/* reader */
#define DEFAULT_CDIO_DEVICE "videocd.bin"

2
lib/driver/image/cdrdao.c
View File

@@ -62,7 +62,7 @@
#include <ctype.h>
#include "filemode.h"
#include "portable.h"
/* reader */

14
lib/driver/image/nrg.c
View File

@@ -178,8 +178,8 @@ static bool
parse_nrg (_img_private_t *p_env, const char *psz_nrg_name,
const cdio_log_level_t log_level)
{
long unsigned int footer_start;
long unsigned int size;
off_t footer_start;
off_t size;
char *footer_buf = NULL;
if (!p_env) return false;
size = cdio_stream_stat (p_env->gen.data_source);
@@ -209,11 +209,11 @@ parse_nrg (_img_private_t *p_env, const char *psz_nrg_name,
cdio_assert ((size - footer_start) <= 4096);
footer_buf = calloc(1, size - footer_start);
footer_buf = calloc(1, (size_t)(size - footer_start));
cdio_stream_seek (p_env->gen.data_source, footer_start, SEEK_SET);
cdio_stream_read (p_env->gen.data_source, footer_buf,
size - footer_start, 1);
(size_t)(size - footer_start), 1);
}
{
int pos = 0;
@@ -844,9 +844,9 @@ _lseek_nrg (void *p_user_data, off_t offset, int whence)
track_info_t *this_track=&(p_env->tocent[i]);
p_env->pos.index = i;
if ( (this_track->sec_count*this_track->datasize) >= offset) {
int blocks = offset / this_track->datasize;
int rem = offset % this_track->datasize;
int block_offset = blocks * this_track->blocksize;
int blocks = (int) (offset / this_track->datasize);
int rem = (int) (offset % this_track->datasize);
off_t block_offset = blocks * this_track->blocksize;
real_offset += block_offset + rem;
p_env->pos.buff_offset = rem;
p_env->pos.lba += blocks;