From 4dd33a56584b51f0074acc5f18516092efa6f12d Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 1 Jan 2010 12:44:54 +0000 Subject: [PATCH] Reacted on compiler warnings of Debian kfreebsd-amd64 buildd --- libisoburn/trunk/libisoburn/isoburn.c | 15 ++++++++------- libisoburn/trunk/xorriso/xorriso.c | 8 ++++---- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisoburn.c | 8 ++++---- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/libisoburn/trunk/libisoburn/isoburn.c b/libisoburn/trunk/libisoburn/isoburn.c index dc67be8e..2d556cc3 100644 --- a/libisoburn/trunk/libisoburn/isoburn.c +++ b/libisoburn/trunk/libisoburn/isoburn.c @@ -6,7 +6,7 @@ /* Class core of libisoburn. - Copyright 2007 - 2009 Vreixo Formoso Lopes + Copyright 2007 - 2010 Vreixo Formoso Lopes Thomas Schmitt */ @@ -362,12 +362,6 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d, new_img= flag&1; early_indev_release= flag&2; - if(new_img && early_indev_release) { - isoburn_msgs_submit(in_o, 0x00060000, - "Programming error: Wrong session setup: new_img && early_indev_release", - 0, "FATAL", 0); - {ret= -4; goto ex;} - } ret= isoburn_find_emulator(&in_o, in_d, 0); if(ret<0 || in_o==NULL) @@ -378,6 +372,13 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d, /* early end will be registered as failure */ in_o->wrote_well= out_o->wrote_well= 0; + if(new_img && early_indev_release) { + isoburn_msgs_submit(in_o, 0x00060000, + "Programming error: Wrong session setup: new_img && early_indev_release", + 0, "FATAL", 0); + {ret= -4; goto ex;} + } + state = isoburn_disc_get_status(in_d); if (state != BURN_DISC_BLANK && state != BURN_DISC_APPENDABLE && state != BURN_DISC_FULL) { diff --git a/libisoburn/trunk/xorriso/xorriso.c b/libisoburn/trunk/xorriso/xorriso.c index 09df0a93..f83bd47f 100644 --- a/libisoburn/trunk/xorriso/xorriso.c +++ b/libisoburn/trunk/xorriso/xorriso.c @@ -25,7 +25,7 @@ or /* Command line oriented batch and dialog tool which creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2009 Thomas Schmitt, + Copyright 2007-2010 Thomas Schmitt, Initial code of this program was derived from program src/askme.c out of scdbackup-0.8.8, Copyright 2007 Thomas Schmitt, BSD-License. @@ -10760,7 +10760,7 @@ no_volunteer:; /* Perform actions */ Xorriso_option_report_about(xorriso, "NOTE", 0); if(do_version) { - sprintf(xorriso->result_line, "Cdrecord 2.01-Emulation Copyright (C) 2009 see libburnia-project.org xorriso\n"); + sprintf(xorriso->result_line, "Cdrecord 2.01-Emulation Copyright (C) 2010 see libburnia-project.org xorriso\n"); Xorriso_result(xorriso, 1); Xorriso_option_version(xorriso, 0); ret= 1; goto ex; @@ -11023,7 +11023,7 @@ int Xorriso_genisofs(struct XorrisO *xorriso, char *whom, continue; if(strcmp(argv[i], "-version")==0) { sprintf(xorriso->result_line, -"mkisofs 2.01-Emulation Copyright (C) 2009 see libburnia-project.org xorriso\n" +"mkisofs 2.01-Emulation Copyright (C) 2010 see libburnia-project.org xorriso\n" ); fd= xorriso->dev_fd_1; if(fd<0) @@ -12482,7 +12482,7 @@ int Xorriso_normalize_acl_text(struct XorrisO *xorriso, char *in_text, int ret, access_count= 0, default_count= 0, pass, is_default, line_len; int was_error= 0, line_count= 0, perms; char *acl_text= NULL, *cpt, *npt, *access_wpt= NULL, *default_wpt= NULL; - char *dpt, *ddpt, **wpt, *ppt; + char *dpt= NULL, *ddpt= NULL, **wpt, *ppt; if(in_text[0] == 0 || strcmp(in_text, "clear") == 0 || strcmp(in_text, "--remove-all") == 0) { diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 0ee59c8f..294ae848 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2009.12.31.144342" +#define Xorriso_timestamP "2010.01.01.124622" diff --git a/libisoburn/trunk/xorriso/xorrisoburn.c b/libisoburn/trunk/xorriso/xorrisoburn.c index c43eceba..b8c9378a 100644 --- a/libisoburn/trunk/xorriso/xorrisoburn.c +++ b/libisoburn/trunk/xorriso/xorrisoburn.c @@ -4,7 +4,7 @@ a command line oriented batch and dialog tool which creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2009 Thomas Schmitt, + Copyright 2007-2010 Thomas Schmitt, Provided under GPL version 2. */ @@ -7960,13 +7960,13 @@ return: value= 1; break; case 4: /* -lba_range *arg1 *arg2 */ + value= 1; + start_lba= *((int *) ftest->arg1); + end_lba= *((int *) ftest->arg2); if(node == NULL) { value= !(start_lba >= 0); goto ex; } - value= 1; - start_lba= *((int *) ftest->arg1); - end_lba= *((int *) ftest->arg2); ret= Xorriso__start_end_lbas(node, &lba_count, &file_start_lbas, &file_end_lbas, &size, 0); if(ret <= 0) {