libburnia/libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Got rid of assert() in options.c by soft means

Browse Source
This commit is contained in:
Thomas Schmitt
2006-10-07 14:19:32 +00:00
parent a8921e4f59
commit d252d1fc9b
7 changed files with 72 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libburn/sector.c
View File

@ -37,13 +37,14 @@ static void uncook_subs(unsigned char *dest, unsigned char *source)
}
}
/* 0 means "same as inmode" */
static int get_outmode(struct burn_write_opts *o)
/* @return >=0 : valid , <0 invalid */
int sector_get_outmode(enum burn_write_types write_type,
enum burn_block_types block_type)
{
if (o->write_type == BURN_WRITE_SAO)
if (write_type == BURN_WRITE_SAO)
return 0;
else
switch (o->block_type) {
switch (block_type) {
case BURN_BLOCK_RAW0:
return BURN_MODE_RAW;
case BURN_BLOCK_RAW16:
@ -54,10 +55,25 @@ static int get_outmode(struct burn_write_opts *o)
return BURN_MODE_RAW | BURN_SUBCODE_R96;
case BURN_BLOCK_MODE1:
return BURN_MODE1;
default:
return -1;
}
assert(0); /* return BURN_MODE_UNIMPLEMENTED :) */
/* ts A61007 : now handled in burn_write_opts_set_write_type() */
/* a ssert(0); */ /* return BURN_MODE_UNIMPLEMENTED :) */
}
/* 0 means "same as inmode" */
static int get_outmode(struct burn_write_opts *o)
{
/* ts A61007 */
return sector_get_outmode(o->write_type, o->block_type);
/* -1 is prevented by check in burn_write_opts_set_write_type() */
/* a ssert(0); */ /* return BURN_MODE_UNIMPLEMENTED :) */
}
static void get_bytes(struct burn_track *track, int count, unsigned char *data)
{
int valid, shortage, curr;