Reacted on warnings of -Wunused-but-set-variable

This commit is contained in:
Thomas Schmitt 2011-07-06 14:25:57 +00:00
parent 9fbae8df29
commit ed8b303d62
3 changed files with 8 additions and 3 deletions

View File

@ -1 +1 @@
#define Cdrskin_timestamP "2011.07.04.171649" #define Cdrskin_timestamP "2011.07.06.142532"

View File

@ -585,7 +585,6 @@ static void *write_disc_worker_func(struct w_list *w)
void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc) void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
{ {
int ret;
struct write_opts o; struct write_opts o;
char *reasons= NULL; char *reasons= NULL;
struct burn_drive *d; struct burn_drive *d;
@ -648,7 +647,7 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
tests in burn_*_write_sync() tests in burn_*_write_sync()
*/ */
BURN_ALLOC_MEM(reasons, char, BURN_REASONS_LEN + 80); BURN_ALLOC_MEM_VOID(reasons, char, BURN_REASONS_LEN + 80);
strcpy(reasons, "Write job parameters are unsuitable:\n"); strcpy(reasons, "Write job parameters are unsuitable:\n");
if (burn_precheck_write(opts, disc, reasons + strlen(reasons), 1) if (burn_precheck_write(opts, disc, reasons + strlen(reasons), 1)
<= 0) { <= 0) {

View File

@ -36,6 +36,12 @@ void *burn_alloc_mem(size_t size, size_t count, int flag);
ret= -1; goto ex; \ ret= -1; goto ex; \
} } } }
#define BURN_ALLOC_MEM_VOID(pt, typ, count) { \
pt= (typ *) burn_alloc_mem(sizeof(typ), (size_t) (count), 0); \
if(pt == NULL) { \
goto ex; \
} }
#define BURN_FREE_MEM(pt) { \ #define BURN_FREE_MEM(pt) { \
if(pt != NULL) \ if(pt != NULL) \
free((char *) pt); \ free((char *) pt); \