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

Reacted on compiler warnings of Debian kfreebsd-amd64 buildd

Browse Source
This commit is contained in:
Thomas Schmitt 2010-01-01 12:44:54 +00:00
parent aebaca8b99
commit 45277ed62b
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libisoburn/isoburn.c
View File

@ -6,7 +6,7 @@
/* /*
Class core of libisoburn. Class core of libisoburn.
Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es> Copyright 2007 - 2010 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
Thomas Schmitt <scdbackup@gmx.net> Thomas Schmitt <scdbackup@gmx.net>
*/ */
@ -362,12 +362,6 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
new_img= flag&1; new_img= flag&1;
early_indev_release= flag&2; 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); ret= isoburn_find_emulator(&in_o, in_d, 0);
if(ret<0 || in_o==NULL) 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 */ /* early end will be registered as failure */
in_o->wrote_well= out_o->wrote_well= 0; 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); state = isoburn_disc_get_status(in_d);
if (state != BURN_DISC_BLANK && state != BURN_DISC_APPENDABLE && if (state != BURN_DISC_BLANK && state != BURN_DISC_APPENDABLE &&
state != BURN_DISC_FULL) { state != BURN_DISC_FULL) {

8
xorriso/xorriso.c
View File

@ -25,7 +25,7 @@ or
/* Command line oriented batch and dialog tool which creates, loads, /* Command line oriented batch and dialog tool which creates, loads,
manipulates and burns ISO 9660 filesystem images. manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2009 Thomas Schmitt, <scdbackup@gmx.net> Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net>
Initial code of this program was derived from program src/askme.c out Initial code of this program was derived from program src/askme.c out
of scdbackup-0.8.8, Copyright 2007 Thomas Schmitt, BSD-License. of scdbackup-0.8.8, Copyright 2007 Thomas Schmitt, BSD-License.
@ -10760,7 +10760,7 @@ no_volunteer:;
/* Perform actions */ /* Perform actions */
Xorriso_option_report_about(xorriso, "NOTE", 0); Xorriso_option_report_about(xorriso, "NOTE", 0);
if(do_version) { 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_result(xorriso, 1);
Xorriso_option_version(xorriso, 0); Xorriso_option_version(xorriso, 0);
ret= 1; goto ex; ret= 1; goto ex;
@ -11023,7 +11023,7 @@ int Xorriso_genisofs(struct XorrisO *xorriso, char *whom,
continue; continue;
if(strcmp(argv[i], "-version")==0) { if(strcmp(argv[i], "-version")==0) {
sprintf(xorriso->result_line, 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; fd= xorriso->dev_fd_1;
if(fd<0) 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 ret, access_count= 0, default_count= 0, pass, is_default, line_len;
int was_error= 0, line_count= 0, perms; int was_error= 0, line_count= 0, perms;
char *acl_text= NULL, *cpt, *npt, *access_wpt= NULL, *default_wpt= NULL; 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 || if(in_text[0] == 0 || strcmp(in_text, "clear") == 0 ||
strcmp(in_text, "--remove-all") == 0) { strcmp(in_text, "--remove-all") == 0) {

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2009.12.31.144342" #define Xorriso_timestamP "2010.01.01.124622"

8
xorriso/xorrisoburn.c
View File

@ -4,7 +4,7 @@
a command line oriented batch and dialog tool which creates, loads, a command line oriented batch and dialog tool which creates, loads,
manipulates and burns ISO 9660 filesystem images. manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2009 Thomas Schmitt, <scdbackup@gmx.net> Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2. Provided under GPL version 2.
*/ */
@ -7960,13 +7960,13 @@ return:
value= 1; value= 1;
break; case 4: /* -lba_range *arg1 *arg2 */ break; case 4: /* -lba_range *arg1 *arg2 */
value= 1;
start_lba= *((int *) ftest->arg1);
end_lba= *((int *) ftest->arg2);
if(node == NULL) { if(node == NULL) {
value= !(start_lba >= 0); value= !(start_lba >= 0);
goto ex; goto ex;
} }
value= 1;
start_lba= *((int *) ftest->arg1);
end_lba= *((int *) ftest->arg2);
ret= Xorriso__start_end_lbas(node, &lba_count, ret= Xorriso__start_end_lbas(node, &lba_count,
&file_start_lbas, &file_end_lbas, &size, 0); &file_start_lbas, &file_end_lbas, &size, 0);
if(ret <= 0) { if(ret <= 0) {