[Debburn-changes] r789 - in cdrkit/trunk: genisoimage genisoimage/diag icedax wodim
harald-hoyer-guest at alioth.debian.org
harald-hoyer-guest at alioth.debian.org
Tue Feb 26 07:59:06 UTC 2008
Author: harald-hoyer-guest
Date: 2008-02-26 07:59:05 +0000 (Tue, 26 Feb 2008)
New Revision: 789
Modified:
cdrkit/trunk/genisoimage/diag/dump.c
cdrkit/trunk/genisoimage/diag/isodump.c
cdrkit/trunk/genisoimage/diag/isoinfo.c
cdrkit/trunk/genisoimage/diag/isovfy.c
cdrkit/trunk/genisoimage/eltorito.c
cdrkit/trunk/icedax/toc.c
cdrkit/trunk/wodim/isosize.c
cdrkit/trunk/wodim/wodim.c
Log:
reverted changes to remove gcc warnings about return values
Modified: cdrkit/trunk/genisoimage/diag/dump.c
===================================================================
--- cdrkit/trunk/genisoimage/diag/dump.c 2008-02-25 11:16:06 UTC (rev 788)
+++ cdrkit/trunk/genisoimage/diag/dump.c 2008-02-26 07:59:05 UTC (rev 789)
@@ -366,10 +366,9 @@
on_comerr((void(*)(int, void *))reset_tty, NULL);
do {
- int ret;
if (file_addr < (off_t)0) file_addr = (off_t)0;
showblock(1);
- ret = read(STDIN_FILENO, &c, 1);
+ read(STDIN_FILENO, &c, 1); /* FIXME: check return value */
if (c == 'a')
file_addr -= PAGE;
if (c == 'b')
@@ -379,11 +378,11 @@
printf("Enter new starting block (in hex):");
if (sizeof (file_addr) > sizeof (long)) {
Llong ll;
- ret = scanf("%llx", &ll);
+ scanf("%llx", &ll); /* FIXME: check return value */
file_addr = (off_t)ll;
} else {
long l;
- ret = scanf("%lx", &l);
+ scanf("%lx", &l); /* FIXME: check return value */
file_addr = (off_t)l;
}
file_addr = file_addr << 11;
@@ -391,10 +390,9 @@
printf(" ");
}
if (c == 'f') {
- char *ret;
crsr2(20, 1);
printf("Enter new search string:");
- ret = fgets((char *)search, sizeof (search), stdin);
+ fgets((char *)search, sizeof (search), stdin); /* FIXME: check return value */
while (search[strlen((char *)search)-1] == '\n')
search[strlen((char *)search)-1] = 0;
crsr2(20, 1);
Modified: cdrkit/trunk/genisoimage/diag/isodump.c
===================================================================
--- cdrkit/trunk/genisoimage/diag/isodump.c 2008-02-25 11:16:06 UTC (rev 788)
+++ cdrkit/trunk/genisoimage/diag/isodump.c 2008-02-26 07:59:05 UTC (rev 789)
@@ -652,11 +652,10 @@
on_comerr((void(*)(int, void *))reset_tty, NULL);
do {
- int ret;
if (file_addr < 0)
file_addr = (off_t)0;
showblock(1);
- ret = read(STDIN_FILENO, &c, 1);
+ read(STDIN_FILENO, &c, 1); /* FIXME: check return value */
if (c == 'a')
file_addr -= blocksize;
if (c == 'b')
@@ -666,11 +665,11 @@
printf("Enter new starting block (in hex):");
if (sizeof (file_addr) > sizeof (long)) {
Llong ll;
- ret = scanf("%llx", &ll);
+ scanf("%llx", &ll); /* FIXME: check return value */
file_addr = (off_t)ll;
} else {
long l;
- ret = scanf("%lx", &l);
+ scanf("%lx", &l); /* FIXME: check return value */
file_addr = (off_t)l;
}
file_addr = file_addr * blocksize;
@@ -678,10 +677,9 @@
printf(" ");
}
if (c == 'f') {
- char *ret;
crsr2(20, 1);
printf("Enter new search string:");
- ret = fgets((char *)search, sizeof (search), stdin);
+ fgets((char *)search, sizeof (search), stdin); /* FIXME: check return value */
while (search[strlen((char *)search)-1] == '\n')
search[strlen((char *)search)-1] = 0;
crsr2(20, 1);
Modified: cdrkit/trunk/genisoimage/diag/isoinfo.c
===================================================================
--- cdrkit/trunk/genisoimage/diag/isoinfo.c 2008-02-25 11:16:06 UTC (rev 788)
+++ cdrkit/trunk/genisoimage/diag/isoinfo.c 2008-02-26 07:59:05 UTC (rev 789)
@@ -641,7 +641,6 @@
len = isonum_733((unsigned char *)idr->size);
while (len > 0) {
- int ret;
#ifdef USE_SCG
readsecs(extent - sector_offset, buff, ISO_BLOCKS(sizeof (buff)));
tlen = (len > sizeof (buff) ? sizeof (buff) : len);
@@ -652,7 +651,7 @@
#endif
len -= tlen;
extent++;
- ret = write(STDOUT_FILENO, buff, tlen);
+ write(STDOUT_FILENO, buff, tlen); /* FIXME: check return value */
}
}
Modified: cdrkit/trunk/genisoimage/diag/isovfy.c
===================================================================
--- cdrkit/trunk/genisoimage/diag/isovfy.c 2008-02-25 11:16:06 UTC (rev 788)
+++ cdrkit/trunk/genisoimage/diag/isovfy.c 2008-02-26 07:59:05 UTC (rev 789)
@@ -583,7 +583,6 @@
char *pnt;
char *typel;
char *typem;
- int ret;
/* Now read in the path tables */
@@ -592,11 +591,11 @@
readsecs(typel_extent * blocksize / 2048, typel, ISO_BLOCKS(path_table_size));
#else
lseek(fileno(infile), (off_t)((off_t)typel_extent) * blocksize, SEEK_SET);
- ret = read(fileno(infile), typel, path_table_size);
+ read(fileno(infile), typel, path_table_size); /* FIXME: check return value */
#endif
typem = (char *) malloc(path_table_size);
lseek(fileno(infile), (off_t)((off_t)typem_extent) * blocksize, SEEK_SET);
- ret = read(fileno(infile), typem, path_table_size);
+ read(fileno(infile), typem, path_table_size); /* FIXME: check return value */
j = path_table_size;
pnt = typel;
Modified: cdrkit/trunk/genisoimage/eltorito.c
===================================================================
--- cdrkit/trunk/genisoimage/eltorito.c 2008-02-25 11:16:06 UTC (rev 788)
+++ cdrkit/trunk/genisoimage/eltorito.c 2008-02-26 07:59:05 UTC (rev 789)
@@ -600,7 +600,6 @@
static char csum_buffer[SECTOR_SIZE];
int len;
struct genisoimage_boot_info bi_table;
- int ret;
bootimage = open(de->whole_name, O_RDWR | O_BINARY);
if (bootimage == -1) {
#ifdef USE_LIBSCHILY
@@ -661,7 +660,7 @@
set_731(bi_table.bi_length, de->size);
set_731(bi_table.bi_csum, bi_checksum);
- ret = write(bootimage, &bi_table, sizeof (bi_table));
+ write(bootimage, &bi_table, sizeof (bi_table)); /* FIXME: check return value */
close(bootimage);
}
}/* fill_boot_desc(... */
Modified: cdrkit/trunk/icedax/toc.c
===================================================================
--- cdrkit/trunk/icedax/toc.c 2008-02-25 11:16:06 UTC (rev 788)
+++ cdrkit/trunk/icedax/toc.c 2008-02-26 07:59:05 UTC (rev 789)
@@ -1070,9 +1070,8 @@
/* get user response. */
do {
- int ret;
fprintf(stderr, "please choose one (0-%u): ", nr);
- ret = scanf("%u", &user_choice);
+ scanf("%u", &user_choice); /* FIXME: check return value */
} while (user_choice > nr);
if (user_choice == nr)
Modified: cdrkit/trunk/wodim/isosize.c
===================================================================
--- cdrkit/trunk/wodim/isosize.c 2008-02-25 11:16:06 UTC (rev 788)
+++ cdrkit/trunk/wodim/isosize.c 2008-02-26 07:59:05 UTC (rev 789)
@@ -69,8 +69,7 @@
vp = (struct iso9660_pr_voldesc *) &vd;
do {
- int ret;
- ret = read(f, &vd, sizeof (vd));
+ read(f, &vd, sizeof (vd)); /* FIXME: check return value */
if (GET_UBYTE(vd.vd_type) == VD_PRIMARY)
break;
Modified: cdrkit/trunk/wodim/wodim.c
===================================================================
--- cdrkit/trunk/wodim/wodim.c 2008-02-25 11:16:06 UTC (rev 788)
+++ cdrkit/trunk/wodim/wodim.c 2008-02-26 07:59:05 UTC (rev 789)
@@ -4076,7 +4076,6 @@
#ifdef DEBUG
int speed = 1;
int oflags = dp->cdr_cmdflags;
- int ret;
dp->cdr_cmdflags &= ~F_DUMMY;
if ((*dp->cdr_set_speed_dummy)(usalp, dp, &speed) < 0)
@@ -4090,7 +4089,7 @@
read_scsi(usalp, buf, 1000, 1);
printf("XXX:\n");
- ret = write(1, buf, 512);
+ write(1, buf, 512); /* FIXME: handle return value */
unload_media(usalp, dp, flags);
comexit(0);
#endif
More information about the Debburn-changes
mailing list