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

trunk@386
Thomas Schmitt 16 years ago
parent b202e3be5b
commit c6bd87af59
  1. 2
      cdrskin/cdrskin_timestamp.h
  2. 47
      libburn/asserts.txt
  3. 23
      libburn/sg.c

@ -1 +1 @@
#define Cdrskin_timestamP "2006.10.07.142454"
#define Cdrskin_timestamP "2006.10.07.170913"

@ -207,21 +207,25 @@ ts A61007
------------------------------------------------------------------------------
15) libburn/init.c: assert(burn_running);
++ 15) libburn/init.c: assert(burn_running);
API burn_finish():
The library is not initialized
: Severe Application Error
=> return (assume no msg system)
ts A61007
------------------------------------------------------------------------------
16) libburn/init.c: assert(burn_running);
++ 16) libburn/init.c: assert(burn_running);
API burn_preset_device_open():
The library is not initialized
: Severe Application Error
=> return -1; (assume no msg system)
=> return (assume no msg system)
ts A61007
------------------------------------------------------------------------------
@ -305,7 +309,7 @@ Called by toc_find_modes(), does the same assert. To be solved there.
------------------------------------------------------------------------------
24) libburn/options.c: assert(0);
++ 24) libburn/options.c: assert(0);
API burn_write_opts_set_write_type():
Detects unsuitable enum burn_write_types write_type and int block_type.
API promises return 0 on failure
@ -313,12 +317,16 @@ API promises return 0 on failure
: Severe Application Error
=> issue LIBDAX_MSGS_SEV_SORRY
=> should also detect problem of 26) : wrong write_type,block_type combination
by calling sector_get_outmode() and checking for -1
=> should also detect problem of 41) : unknown block_type
by spc_block_type() and checking for -1
=> delete assert(0)
ts A61007
------------------------------------------------------------------------------
25) libburn/read.c: assert((o->version & 0xfffff000) == (OPTIONS_VERSION & 0xfffff000));
++ 25) libburn/read.c: assert((o->version & 0xfffff000) == (OPTIONS_VERSION & 0xfffff000));
libburn/read.c: assert(!d->busy);
libburn/read.c: assert(d->toc->valid);
libburn/read.c: assert(o->datafd != -1);
@ -333,16 +341,21 @@ OPTIONS_VERSION does not occur outside this line
( 37) => catch ! d->mdata->valid )
=> :)
ts A61007
------------------------------------------------------------------------------
26) libburn/sector.c: assert(0); /* return BURN_MODE_UNIMPLEMENTED :) */
++ 26) libburn/sector.c: assert(0); /* return BURN_MODE_UNIMPLEMENTED :) */
static get_outmode():
burn_write_opts is wrongly programmed with .write_type and .block_type
: Severe Application Error
=> This should be handled by burn_write_opts_set_write_type()
=> This gets handled by burn_write_opts_set_write_type()
ts A61007 by new semi-public sector_get_outmode()
=> delete assert()
ts A61007
------------------------------------------------------------------------------
27) libburn/sector.c: assert(outlen >= inlen);
@ -402,25 +415,28 @@ process_q()
------------------------------------------------------------------------------
32) libburn/sg.c: assert("drive busy" == "non fatal");
++ 32) libburn/sg.c: assert("drive busy" == "non fatal");
sg_handle_busy_device():
Intentional abort preset by the app
=> change to abort()
ts A61007
------------------------------------------------------------------------------
33) libburn/sg.c: assert(fd != -1337);
++ 33) libburn/sg.c: assert(fd != -1337);
sg_grab():
The drive device file could not be opened
:Severe External Problem
=> issue LIBDAX_MSGS_SEV_FATAL
=> return 0
=> obsolete by normal drive open failure handling
ts A61007
------------------------------------------------------------------------------
34) libburn/sg.c: assert(!c->page);
++ 34) libburn/sg.c: assert(!c->page);
sg_issue_command():
An SCSI command of direction NO_TRANSFER may not have a .page != NULL.
@ -430,6 +446,8 @@ it is sufficient to just not use it.
: Libburn Error
=> enhance internal logics of sg_issue_command()
ts A61007
------------------------------------------------------------------------------
35) libburn/sg.c: assert(c->page->bytes > 0);
@ -508,7 +526,7 @@ Called by (see 39)
------------------------------------------------------------------------------
41) libburn/spc.c: assert(0);
++ 41) libburn/spc.c: assert(0);
spc_block_type():
Unknown value with enum burn_block_types
@ -517,8 +535,11 @@ Called by spc_select_write_params, uses burn_write_opts.block_type,
: Severe Application Error
=> catch in API burn_write_opts_set_write_type
by calling spc_block_type()
=> delete assert
ts A61007
------------------------------------------------------------------------------
42) libburn/structure.c: assert(!(pos > BURN_POS_END));\

@ -12,6 +12,7 @@
#include <string.h>
#include <sys/poll.h>
#include <linux/hdreg.h>
#include <stdlib.h>
#include "transport.h"
#include "drive.h"
@ -99,7 +100,10 @@ int sg_handle_busy_device(char *fname, int os_errno)
fprintf(stderr,
"\nlibburn: FATAL : Application triggered abort on busy device '%s'\n",
fname);
assert("drive busy" == "non fatal");
/* ts A61007 */
abort();
/* a ssert("drive busy" == "non fatal"); */
}
/* ts A60924 : now reporting to libdax_msgs */
@ -451,7 +455,7 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
out.mdata = malloc(sizeof(struct scsi_mode_data));
out.mdata->valid = 0;
/* ts A61007 : obsolete assert() in drive_getcaps() */
/* ts A61007 : obsolete Assert in drive_getcaps() */
if(out.idata == NULL || out.mdata == NULL) {
libdax_msgs_submit(libdax_messenger, -1, 0x00020108,
LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
@ -544,8 +548,10 @@ int sg_grab(struct burn_drive *d)
} else
fd= d->fd;
assert(fd != -1337);
if (-1 != fd) {
/* ts A61007 : this is redundant */
/* a ssert(fd != -1337); */
if (fd >= 0) {
/* ts A60814:
according to my experiments this test would work now ! */
@ -606,7 +612,7 @@ int sg_release(struct burn_drive *d)
int sg_issue_command(struct burn_drive *d, struct command *c)
{
int done = 0;
int done = 0, no_c_page = 0;
int err;
sg_io_hdr_t s;
@ -639,7 +645,10 @@ this is valid during the mode probe in scan
s.dxfer_direction = SG_DXFER_FROM_DEV;
else if (c->dir == NO_TRANSFER) {
s.dxfer_direction = SG_DXFER_NONE;
assert(!c->page);
/* ts A61007 */
/* a ssert(!c->page); */
no_c_page = 1;
}
s.cmd_len = c->oplen;
s.cmdp = c->opcode;
@ -647,7 +656,7 @@ this is valid during the mode probe in scan
s.sbp = c->sense;
memset(c->sense, 0, sizeof(c->sense));
s.timeout = 200000;
if (c->page) {
if (c->page && !no_c_page) {
s.dxferp = c->page->data;
if (c->dir == FROM_DRIVE) {
s.dxfer_len = BUFFER_SIZE;

Loading…
Cancel
Save