From 64f7f5d6093b2e25543054defdf276ac650b0aa2 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 15 Jul 2011 08:13:46 +0000 Subject: [PATCH] Reacted on warning of cppcheck about libburn/sg-freebsd.c --- cdrskin/cdrskin_timestamp.h | 2 +- libburn/sg-freebsd.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index 9e1abca..ec517b5 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2011.07.14.162150" +#define Cdrskin_timestamP "2011.07.15.081325" diff --git a/libburn/sg-freebsd.c b/libburn/sg-freebsd.c index 7434fb9..39bcee1 100644 --- a/libburn/sg-freebsd.c +++ b/libburn/sg-freebsd.c @@ -2,7 +2,8 @@ /* Copyright (c) 2006 - 2011 Thomas Schmitt - Provided under GPL version 2 or later. + Provided under GPL version 2 or later + and under FreeBSD license revised, i.e. without advertising clause. */ #ifdef HAVE_CONFIG_H @@ -764,7 +765,7 @@ int sg_release(struct burn_drive *d) int sg_issue_command(struct burn_drive *d, struct command *c) { - int done = 0, err, sense_len = 0, ret, ignore_error, no_retry = 0, i; + int done = 0, err, sense_len = 0, ret, ignore_error, i; int cam_pass_err_recover = 0, key, asc, ascq, timeout_ms; union ccb *ccb; static FILE *fp = NULL; @@ -957,7 +958,7 @@ int sg_issue_command(struct burn_drive *d, struct command *c) c->sense[2] = 0x02; c->sense[12] = 0x04; c->sense[13] = 0x00; - no_retry = 1; + done = 1; } /* >>> Need own duration time measurement. @@ -1011,7 +1012,7 @@ int burn_os_is_2k_seekrw(char *path, int flag) ret = ioctl(fd, DIOCGMEDIASIZE, &add_size); close(fd); - return 1; + return (ret != -1); #else /* Libburn_DIOCGMEDIASIZE_ISBLK */