[Debburn-changes] r787 - in cdrkit/trunk: genisoimage genisoimage/diag icedax include libhfs_iso librols libusal libusal/usal wodim
harald-hoyer-guest at alioth.debian.org
harald-hoyer-guest at alioth.debian.org
Mon Feb 25 11:14:08 UTC 2008
Author: harald-hoyer-guest
Date: 2008-02-25 11:14:07 +0000 (Mon, 25 Feb 2008)
New Revision: 787
Modified:
cdrkit/trunk/genisoimage/boot-hppa.c
cdrkit/trunk/genisoimage/boot-mips.c
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/genisoimage/genisoimage.c
cdrkit/trunk/genisoimage/joliet.c
cdrkit/trunk/genisoimage/jte.c
cdrkit/trunk/genisoimage/md5.c
cdrkit/trunk/genisoimage/multi.c
cdrkit/trunk/genisoimage/tree.c
cdrkit/trunk/genisoimage/write.c
cdrkit/trunk/icedax/toc.c
cdrkit/trunk/include/libport.h
cdrkit/trunk/libhfs_iso/hfs.c
cdrkit/trunk/libhfs_iso/hfs.h
cdrkit/trunk/librols/default.c
cdrkit/trunk/librols/fexec.c
cdrkit/trunk/librols/raisecond.c
cdrkit/trunk/libusal/scsi-linux-ata.c
cdrkit/trunk/libusal/scsi-linux-sg.c
cdrkit/trunk/libusal/scsierrs.c
cdrkit/trunk/libusal/scsitransp.c
cdrkit/trunk/libusal/usal/usalops.h
cdrkit/trunk/wodim/drv_mmc.c
cdrkit/trunk/wodim/isosize.c
cdrkit/trunk/wodim/scsi_cdr.c
cdrkit/trunk/wodim/scsi_scan.c
cdrkit/trunk/wodim/scsi_scan.h
cdrkit/trunk/wodim/wodim.c
Log:
fixed most of gcc's warnings
Modified: cdrkit/trunk/genisoimage/boot-hppa.c
===================================================================
--- cdrkit/trunk/genisoimage/boot-hppa.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/genisoimage/boot-hppa.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -177,7 +177,7 @@
write_be32(length, &boot_sector[20]);
/* Now the commandline */
- snprintf(&boot_sector[24], 127, "%s", hppa_cmdline);
+ snprintf((char *)&boot_sector[24], 127, "%s", hppa_cmdline);
/* Find the dir entry for the 64-bit kernel by walking our file list */
boot_file = search_tree_file(root, hppa_kernel_64);
Modified: cdrkit/trunk/genisoimage/boot-mips.c
===================================================================
--- cdrkit/trunk/genisoimage/boot-mips.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/genisoimage/boot-mips.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -310,7 +310,7 @@
length = ((get_733(boot_file->isorec.size) + 2047) / 2048) * 2048;
filename = file_base_name(boot_mips_filename[i]);
- strncpy(vh.vh_vd[i].vd_name, filename, MIN(VDNAMESIZE, strlen(filename)));
+ strncpy((char *)vh.vh_vd[i].vd_name, filename, MIN(VDNAMESIZE, strlen(filename)));
write_be32(extent, (unsigned char *)&vh.vh_vd[i].vd_lbn);
write_be32(length, (unsigned char *)&vh.vh_vd[i].vd_nbytes);
Modified: cdrkit/trunk/genisoimage/diag/dump.c
===================================================================
--- cdrkit/trunk/genisoimage/diag/dump.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/genisoimage/diag/dump.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -366,9 +366,10 @@
on_comerr((void(*)(int, void *))reset_tty, NULL);
do {
+ int ret;
if (file_addr < (off_t)0) file_addr = (off_t)0;
showblock(1);
- read(STDIN_FILENO, &c, 1);
+ ret = read(STDIN_FILENO, &c, 1);
if (c == 'a')
file_addr -= PAGE;
if (c == 'b')
@@ -378,11 +379,11 @@
printf("Enter new starting block (in hex):");
if (sizeof (file_addr) > sizeof (long)) {
Llong ll;
- scanf("%llx", &ll);
+ ret = scanf("%llx", &ll);
file_addr = (off_t)ll;
} else {
long l;
- scanf("%lx", &l);
+ ret = scanf("%lx", &l);
file_addr = (off_t)l;
}
file_addr = file_addr << 11;
@@ -390,9 +391,10 @@
printf(" ");
}
if (c == 'f') {
+ char *ret;
crsr2(20, 1);
printf("Enter new search string:");
- fgets((char *)search, sizeof (search), stdin);
+ ret = fgets((char *)search, sizeof (search), stdin);
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-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/genisoimage/diag/isodump.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -652,10 +652,11 @@
on_comerr((void(*)(int, void *))reset_tty, NULL);
do {
+ int ret;
if (file_addr < 0)
file_addr = (off_t)0;
showblock(1);
- read(STDIN_FILENO, &c, 1);
+ ret = read(STDIN_FILENO, &c, 1);
if (c == 'a')
file_addr -= blocksize;
if (c == 'b')
@@ -665,11 +666,11 @@
printf("Enter new starting block (in hex):");
if (sizeof (file_addr) > sizeof (long)) {
Llong ll;
- scanf("%llx", &ll);
+ ret = scanf("%llx", &ll);
file_addr = (off_t)ll;
} else {
long l;
- scanf("%lx", &l);
+ ret = scanf("%lx", &l);
file_addr = (off_t)l;
}
file_addr = file_addr * blocksize;
@@ -677,9 +678,10 @@
printf(" ");
}
if (c == 'f') {
+ char *ret;
crsr2(20, 1);
printf("Enter new search string:");
- fgets((char *)search, sizeof (search), stdin);
+ ret = fgets((char *)search, sizeof (search), stdin);
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-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/genisoimage/diag/isoinfo.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -641,6 +641,7 @@
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);
@@ -651,7 +652,7 @@
#endif
len -= tlen;
extent++;
- write(STDOUT_FILENO, buff, tlen);
+ ret = write(STDOUT_FILENO, buff, tlen);
}
}
Modified: cdrkit/trunk/genisoimage/diag/isovfy.c
===================================================================
--- cdrkit/trunk/genisoimage/diag/isovfy.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/genisoimage/diag/isovfy.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -583,6 +583,7 @@
char *pnt;
char *typel;
char *typem;
+ int ret;
/* Now read in the path tables */
@@ -591,11 +592,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);
- read(fileno(infile), typel, path_table_size);
+ ret = read(fileno(infile), typel, path_table_size);
#endif
typem = (char *) malloc(path_table_size);
lseek(fileno(infile), (off_t)((off_t)typem_extent) * blocksize, SEEK_SET);
- read(fileno(infile), typem, path_table_size);
+ ret = read(fileno(infile), typem, path_table_size);
j = path_table_size;
pnt = typel;
Modified: cdrkit/trunk/genisoimage/eltorito.c
===================================================================
--- cdrkit/trunk/genisoimage/eltorito.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/genisoimage/eltorito.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -600,7 +600,7 @@
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 +661,7 @@
set_731(bi_table.bi_length, de->size);
set_731(bi_table.bi_csum, bi_checksum);
- write(bootimage, &bi_table, sizeof (bi_table));
+ ret = write(bootimage, &bi_table, sizeof (bi_table));
close(bootimage);
}
}/* fill_boot_desc(... */
Modified: cdrkit/trunk/genisoimage/genisoimage.c
===================================================================
--- cdrkit/trunk/genisoimage/genisoimage.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/genisoimage/genisoimage.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -2451,8 +2451,8 @@
if (stream_filename) {
if (strlen(stream_filename) > MAX_ISONAME)
comerrno(EX_BAD,
- "stream-file-name too long (%d), max is %d.\n",
- strlen(stream_filename), MAX_ISONAME);
+ "stream-file-name too long (%d), max is %d.\n",
+ (int)strlen(stream_filename), (int)MAX_ISONAME);
if (strchr(stream_filename, '/'))
comerrno(EX_BAD, "Illegal character '/' in stream-file-name.\n");
iso9660_level = 4;
Modified: cdrkit/trunk/genisoimage/joliet.c
===================================================================
--- cdrkit/trunk/genisoimage/joliet.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/genisoimage/joliet.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -250,9 +250,9 @@
#ifdef USE_ICONV
if (inls->iconv_d && inls->unls_cs2uni==NULL &&
inls->unls_uni2cs==NULL) {
- char *inptr = tmpbuf;
- char *outptr = buffer;
- size_t inleft = strlen(tmpbuf);
+ char *inptr = (char *)tmpbuf;
+ char *outptr = (char *)buffer;
+ size_t inleft = (size_t)strlen((char *)tmpbuf);
size_t inlen = inleft;
size_t outleft = size;
Modified: cdrkit/trunk/genisoimage/jte.c
===================================================================
--- cdrkit/trunk/genisoimage/jte.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/genisoimage/jte.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -535,13 +535,13 @@
}
memset(buf, 0, sizeof(buf));
- while (fgets(buf, sizeof(buf), md5_file))
+ while (fgets((char *)buf, sizeof(buf), md5_file))
{
numbuf = &buf[34];
- filename = &buf[48];
+ filename = (char *)&buf[48];
/* Lose the trailing \n from the fgets() call */
- if (buf[strlen(buf)-1] == '\n')
- buf[strlen(buf)-1] = 0;
+ if (buf[strlen((char *)buf)-1] == '\n')
+ buf[strlen((char *)buf)-1] = 0;
if (mk_MD5Parse(buf, md5))
{
@@ -879,7 +879,7 @@
/* And calculate the image size */
image_size = (unsigned long long)SECTOR_SIZE * last_extent_written;
- write_template_desc_entries(image_size, image_md5);
+ write_template_desc_entries(image_size, (char *)image_md5);
write_jigdo_file();
}
Modified: cdrkit/trunk/genisoimage/md5.c
===================================================================
--- cdrkit/trunk/genisoimage/md5.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/genisoimage/md5.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -352,15 +352,15 @@
remain = size;
while (remain > 0)
{
- use = (remain > sizeof(buffer) ? sizeof(buffer) : remain);
- if (fread(buffer, 1, use, infile) == 0)
- {
- fprintf(stderr, "cannot read from '%s'\n", filename);
- exit(1);
- }
- /* Update the checksum */
- mk_MD5Update(&file_context, buffer, use);
- remain -= use;
+ use = (remain > sizeof(buffer) ? sizeof(buffer) : remain);
+ if (fread(buffer, 1, use, infile) == 0)
+ {
+ fprintf(stderr, "cannot read from '%s'\n", filename);
+ exit(1);
+ }
+ /* Update the checksum */
+ mk_MD5Update(&file_context, (unsigned char *)buffer, use);
+ remain -= use;
}
fclose(infile);
mk_MD5Final(&out[0], &file_context);
Modified: cdrkit/trunk/genisoimage/multi.c
===================================================================
--- cdrkit/trunk/genisoimage/multi.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/genisoimage/multi.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -1064,7 +1064,7 @@
}
/* We found it and we can reuse the extent */
memcpy(curr_entry->isorec.extent, ptr[i]->isorec.extent, 8);
- curr_entry->starting_block = isonum_733(ptr[i]->isorec.extent);
+ curr_entry->starting_block = isonum_733((unsigned char *)ptr[i]->isorec.extent);
curr_entry->de_flags |= SAFE_TO_REUSE_TABLE_ENTRY;
goto found_it;
}
Modified: cdrkit/trunk/genisoimage/tree.c
===================================================================
--- cdrkit/trunk/genisoimage/tree.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/genisoimage/tree.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -41,6 +41,7 @@
#include <mconfig.h>
#include "genisoimage.h"
#include "match.h"
+#include "udf.h"
#include "exclude.h"
#include <timedefs.h>
#include <errno.h>
Modified: cdrkit/trunk/genisoimage/write.c
===================================================================
--- cdrkit/trunk/genisoimage/write.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/genisoimage/write.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -303,7 +303,8 @@
* which is wrong this code. (void *) introduces a compatible
* intermediate type in the cast list.
*/
- count -= got, *(char **)(void *)&buffer += size * got;
+ count -= got;
+ buffer = (void *)(((char *)buffer) + size * got);
}
}
@@ -918,8 +919,8 @@
if (verbose > 2 && s_entry->size != 0) {
fprintf(stderr, "%8d %8d ",
- s_entry->starting_block,
- s_entry->starting_block + ISO_BLOCKS(s_entry->size) - 1);
+ (int)s_entry->starting_block,
+ (int)(s_entry->starting_block + ISO_BLOCKS(s_entry->size) - 1));
if (s_entry->inode != TABLE_INODE) {
fprintf(stderr, "%s\n", s_entry->whole_name);
Modified: cdrkit/trunk/icedax/toc.c
===================================================================
--- cdrkit/trunk/icedax/toc.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/icedax/toc.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -864,7 +864,7 @@
int finished = 0;
char *p = inbuff;
int ind = 0;
- char ** target = (char **)&global.creator;
+ unsigned char ** target = &global.creator;
do {
while (readbytes > 0) {
@@ -935,7 +935,7 @@
if (*target != NULL)
**target = '\0';
} else {
- *target = realloc(*target, strlen(*target) + clen - 1);
+ *target = realloc(*target, strlen((char *)*target) + clen - 1);
}
if (*target != NULL) {
strcat((char *)*target, inbuff+ind+7);
@@ -943,7 +943,7 @@
/* handle part after the delimiter, if present */
if (res != NULL) {
- target = (char **)&global.disctitle;
+ target = (unsigned char **)&global.disctitle;
/* skip the delimiter */
q += 3;
clen = p - q;
@@ -1070,8 +1070,9 @@
/* get user response. */
do {
+ int ret;
fprintf(stderr, "please choose one (0-%u): ", nr);
- scanf("%u", &user_choice);
+ ret = scanf("%u", &user_choice);
} while (user_choice > nr);
if (user_choice == nr)
Modified: cdrkit/trunk/include/libport.h
===================================================================
--- cdrkit/trunk/include/libport.h 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/include/libport.h 2008-02-25 11:14:07 UTC (rev 787)
@@ -67,9 +67,11 @@
/* Linux MAXHOSTNAMELEN */
#endif
#ifdef MAXHOSTNAMELEN
+#ifndef HOST_NAME_MAX
#define HOST_NAME_MAX MAXHOSTNAMELEN
#endif
#endif
+#endif
#ifndef HOST_NAME_MAX
#define HOST_NAME_MAX 255
Modified: cdrkit/trunk/libhfs_iso/hfs.c
===================================================================
--- cdrkit/trunk/libhfs_iso/hfs.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/libhfs_iso/hfs.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -50,6 +50,7 @@
#include "node.h"
#include "record.h"
#include "volume.h"
+#include "hfs.h"
/* High-Level Volume Routines ============================================== */
Modified: cdrkit/trunk/libhfs_iso/hfs.h
===================================================================
--- cdrkit/trunk/libhfs_iso/hfs.h 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/libhfs_iso/hfs.h 2008-02-25 11:14:07 UTC (rev 787)
@@ -29,6 +29,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifndef HFS_H
+#define HFS_H
#include <timedefs.h>
#include <standard.h>
@@ -195,8 +197,12 @@
int hfs_rename(hfsvol *, char *, char *);
+int f_trunc(hfsfile *file);
+
#ifdef APPLE_HYB
unsigned short hfs_get_drAllocPtr(hfsfile *);
int hfs_set_drAllocPtr(hfsfile *, unsigned short, int size);
void hfs_vsetbless(hfsvol *, unsigned long);
#endif /* APPLE_HYB */
+
+#endif
Modified: cdrkit/trunk/librols/default.c
===================================================================
--- cdrkit/trunk/librols/default.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/librols/default.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -56,7 +56,7 @@
next_line:
while(fgets(linebuf, sizeof(linebuf)-1, srcfile)) {
int i;
- int keybeg;
+ int keybeg=0;
int s=KEYBEGINSEARCH;
char *ret=NULL;
int lastchar=0;
Modified: cdrkit/trunk/librols/fexec.c
===================================================================
--- cdrkit/trunk/librols/fexec.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/librols/fexec.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -204,6 +204,8 @@
int o[3];
int f[3];
int errsav;
+
+ o[0] = o[1] = o[2] = f[0] = f[1] = f[2] = 0;
#endif
fflush(out);
Modified: cdrkit/trunk/librols/raisecond.c
===================================================================
--- cdrkit/trunk/librols/raisecond.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/librols/raisecond.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -58,8 +58,8 @@
#ifndef STDERR_FILENO
#define STDERR_FILENO 2
#endif
-#define eprints(a) (void)write(STDERR_FILENO, (a), sizeof (a)-1)
-#define eprintl(a) (void)write(STDERR_FILENO, (a), strlen(a))
+#define eprints(a) do { int ret; ret = write(STDERR_FILENO, (a), sizeof (a)-1); } while (0)
+#define eprintl(a) do { int ret; ret = write(STDERR_FILENO, (a), strlen(a)); } while (0)
#define is_even(p) ((((long)(p)) & 1) == 0)
#define even(p) (((long)(p)) & ~1L)
Modified: cdrkit/trunk/libusal/scsi-linux-ata.c
===================================================================
--- cdrkit/trunk/libusal/scsi-linux-ata.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/libusal/scsi-linux-ata.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -258,7 +258,7 @@
starget,
slun;
- f = sg_open_excl(device, O_RDONLY | O_NONBLOCK);
+ f = sg_open_excl(device, O_RDONLY | O_NONBLOCK, FALSE);
if (f < 0) {
if (usalp->errstr)
@@ -770,11 +770,11 @@
l = 0;
#endif /* nonono */
/* other solution, with ioctl */
- int Chan,
- Ino,
- Bus,
- Target,
- Lun;
+ int Chan = 0,
+ Ino = 0,
+ Bus = 0,
+ Target = 0,
+ Lun = 0;
subsystem = HOST_SCSI;
sg_amapdev_scsi(usalp, f, &Bus, &Target, &Lun, &Chan, &Ino);
@@ -1008,7 +1008,7 @@
}
sg_cgc.buflen = sp->size;
- sg_cgc.buffer = sp->addr;
+ sg_cgc.buffer = (unsigned char *)sp->addr;
if (sp->sense_len > sizeof (sense_cgc))
sense_cgc.add_sense_len = sizeof (sense_cgc) - 8;
Modified: cdrkit/trunk/libusal/scsi-linux-sg.c
===================================================================
--- cdrkit/trunk/libusal/scsi-linux-sg.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/libusal/scsi-linux-sg.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -181,7 +181,7 @@
struct usal_local {
int usalfile; /* Used for SG_GET_BUFSIZE ioctl()*/
short usalfiles[MAX_SCG][MAX_TGT][MAX_LUN];
- char *filenames[MAX_SCG][MAX_TGT][MAX_LUN];
+ char *filenames[MAX_SCG][MAX_TGT][MAX_LUN];
short buscookies[MAX_SCG];
int pgbus;
int pack_id; /* Should be a random number */
@@ -217,14 +217,7 @@
/*#define MISALIGN*/
/*#undef SG_GET_BUFSIZE*/
-#if defined(USE_PG) && !defined(USE_PG_ONLY)
-#include "scsi-linux-pg.c"
-#endif
-#ifdef USE_OLD_ATAPI
-#include "scsi-linux-ata.c"
-#endif
-
#ifdef MISALIGN
static int sg_getint(int *ip);
#endif
@@ -248,6 +241,12 @@
static BOOL get_max_secs(char *dirpath, int *outval);
+#if defined(USE_PG) && !defined(USE_PG_ONLY)
+#include "scsi-linux-pg.c"
+#endif
+#ifdef USE_OLD_ATAPI
+#include "scsi-linux-ata.c"
+#endif
BOOL check_linux_26() {
int gen, tmp;
@@ -465,9 +464,10 @@
for (b = 0; b < MAX_SCG; b++) {
usallocal(usalp)->buscookies[b] = (short)-1;
for (t = 0; t < MAX_TGT; t++) {
- for (l = 0; l < MAX_LUN; l++)
+ for (l = 0; l < MAX_LUN; l++) {
usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
usallocal(usalp)->filenames[b][t][l] = NULL;
+ }
}
}
}
@@ -511,10 +511,12 @@
#define SCD 1
#define SG 2
int h;
+/*
retry_scan_open:
+*/
for(h=HDX; h <= (fake_atabus ? HDX : SG) ; h++) {
- char *pattern;
- unsigned int first, last;
+ char *pattern = NULL;
+ unsigned int first = 0, last = 0;
switch(h) {
case(HDX):
{
@@ -594,13 +596,14 @@
/* that's crap, should not be reached in non-scan mode.
* Let's see whether it can be mapped to an atapi
- * device to emulate some old cludge's behaviour. */
+ * device to emulate some old cludge's behaviour.
if(!in_scanmode && busno < 1000 && busno >=0) {
fake_atabus=1;
fprintf(stderr, "Unable to open this SCSI ID. Trying to map to old ATA syntax."
"This workaround will disappear in the near future. Fix your configuration.");
goto retry_scan_open;
}
+ */
}
}
@@ -801,7 +804,7 @@
for (i = 0; i < 1000; i++) { /* Read at least 32k from /dev/sg* */
int ret;
- ret = read(f, &sg_rep, sizeof (sg_rep));
+ ret = read(f, &sg_rep, sizeof (struct sg_rep));
if (ret > 0)
continue;
if (ret == 0 || errno == EAGAIN || errno == EIO)
@@ -993,12 +996,14 @@
}
#endif
-static void freadstring(char *fn, char *out, int len) {
+static char *freadstring(char *fn, char *out, int len) {
+ char *ret;
FILE *fd=fopen(fn, "r");
out[0]='\0';
- if(!fd) return;
- fgets(out, len, fd);
+ if(!fd) return NULL;
+ ret = fgets(out, len, fd);
fclose(fd);
+ return ret;
}
static long
@@ -1026,14 +1031,13 @@
major=stbuf.st_rdev>>8;
minor=stbuf.st_rdev&0xFF;
if (usalp->debug > 0)
- fprintf(stderr, "Looking for data for major:minor: %d:%d\n", major, minor);
+ fprintf(stderr, "Looking for data for major:minor: %ld:%ld\n", major, minor);
glob_t globbuf;
memset(&globbuf, 0, sizeof(glob_t));
/* *dev files contain the major:minor strings to compare */
glob("/sys/class/scsi_generic/*/device/block*/queue/max_sectors_kb", GLOB_DOOFFS | GLOB_NOSORT, NULL, &globbuf);
glob("/sys/block/*/device/block*/queue/max_sectors_kb", GLOB_DOOFFS | GLOB_NOSORT | GLOB_APPEND, NULL, &globbuf);
for(i=0;i<globbuf.gl_pathc; i++) {
- FILE *fd;
char *cut, *ende;
char buf[64];
cut=strstr(globbuf.gl_pathv[i], "/device/")+4;
Modified: cdrkit/trunk/libusal/scsierrs.c
===================================================================
--- cdrkit/trunk/libusal/scsierrs.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/libusal/scsierrs.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -55,6 +55,7 @@
const char *usal_sensemsg(int, int, int, const char **, char *, int maxcnt);
int usal__errmsg(SCSI *usalp, char *obuf, int maxcnt, struct scsi_sense *,
struct scsi_status *, int);
+#ifdef ABC
/*
* Map old non extended sense to sense key.
*/
@@ -67,6 +68,7 @@
6, 6, 6, 5, 4,11,11,11 /* 0x28-0x2f */
};
#define MAX_ADAPTEC_KEYS (sizeof (sd_adaptec_keys))
+#endif
/*
* Deviations to CCS found on old pre CCS devices
@@ -667,6 +669,7 @@
"Reserved" /* 0x0f */
};
+#ifdef ABC
static char *sd_cmds[] = {
"\000test unit ready", /* 0x00 */
"\001rezero", /* 0x01 */
@@ -687,7 +690,9 @@
"\067read defect data", /* 0x37 */
NULL
};
+#endif
+
const char *
usal_sensemsg(register int ctype, register int code, register int qual,
register const char **vec, char *sbuf, int maxcnt)
Modified: cdrkit/trunk/libusal/scsitransp.c
===================================================================
--- cdrkit/trunk/libusal/scsitransp.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/libusal/scsitransp.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -1154,7 +1154,7 @@
return (0);
/* if (cp->sense.code >= 0x70) */
- return (char *) &(cp->sense);
+ return (unsigned char *) &(cp->sense);
}
Modified: cdrkit/trunk/libusal/usal/usalops.h
===================================================================
--- cdrkit/trunk/libusal/usal/usalops.h 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/libusal/usal/usalops.h 2008-02-25 11:14:07 UTC (rev 787)
@@ -76,6 +76,8 @@
#define SCGO_ISATAPI(usalp) (*(usalp)->ops->usalo_isatapi)(usalp)
#define SCGO_RESET(usalp, what) (*(usalp)->ops->usalo_reset)(usalp, what)
+extern int usal_fileno(SCSI *usalp, int busno, int tgt, int tlun);
+extern char * usal_natname(SCSI *usalp, int busno, int tgt, int tlun);
#ifdef __cplusplus
}
#endif
Modified: cdrkit/trunk/wodim/drv_mmc.c
===================================================================
--- cdrkit/trunk/wodim/drv_mmc.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/wodim/drv_mmc.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -59,6 +59,7 @@
#include "scsimmc.h"
#include "mmcvendor.h"
#include "wodim.h"
+#include "scsi_scan.h"
extern char *driveropts;
@@ -166,6 +167,9 @@
long parlen, void *buffer, long buflen);
static int dvd_dual_layer_split(SCSI *usalp, cdr_t *dp, long tsize);
+extern int reserve_track(SCSI *usalp, Ulong size); /* FIXME */
+extern int scsi_format(SCSI *usalp, caddr_t addr, int size, BOOL background); /* FIXME */
+
#ifdef __needed__
static int
mmc_load(SCSI *usalp, cdr_t *dp)
@@ -2851,9 +2855,9 @@
flush();
}
if (formattype == FULL_FORMAT) {
- ret = scsi_format(usalp, &addr, sizeof(addr), FALSE);
+ ret = scsi_format(usalp, (caddr_t)&addr, sizeof(addr), FALSE);
} else {
- ret = scsi_format(usalp, &addr, sizeof(addr), TRUE);
+ ret = scsi_format(usalp, (caddr_t)&addr, sizeof(addr), TRUE);
}
if (ret < 0)
return (ret);
Modified: cdrkit/trunk/wodim/isosize.c
===================================================================
--- cdrkit/trunk/wodim/isosize.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/wodim/isosize.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -69,7 +69,8 @@
vp = (struct iso9660_pr_voldesc *) &vd;
do {
- read(f, &vd, sizeof (vd));
+ int ret;
+ ret = read(f, &vd, sizeof (vd));
if (GET_UBYTE(vd.vd_type) == VD_PRIMARY)
break;
Modified: cdrkit/trunk/wodim/scsi_cdr.c
===================================================================
--- cdrkit/trunk/wodim/scsi_cdr.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/wodim/scsi_cdr.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -63,6 +63,7 @@
#include "scsimmc.h"
#include "wodim.h"
+#include "scsi_scan.h"
#define strbeg(s1, s2) (strstr((s2), (s1)) == (s2))
Modified: cdrkit/trunk/wodim/scsi_scan.c
===================================================================
--- cdrkit/trunk/wodim/scsi_scan.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/wodim/scsi_scan.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -50,7 +50,10 @@
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+
static void print_product(FILE *f, struct scsi_inquiry *ip);
int select_target(SCSI *usalp, FILE *f);
@@ -200,7 +203,7 @@
int fd, ndevs=0;
struct stat statbuf;
char *lines[MAXDEVCOUNT];
- char buf[256], perms[8], *p;
+ char buf[256], perms[8];
usalp->silent++;
Modified: cdrkit/trunk/wodim/scsi_scan.h
===================================================================
--- cdrkit/trunk/wodim/scsi_scan.h 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/wodim/scsi_scan.h 2008-02-25 11:14:07 UTC (rev 787)
@@ -39,5 +39,6 @@
extern int select_target(SCSI *usalp, FILE *f);
extern int list_devices(SCSI *usalp, FILE *f, int pickup_type);
extern SCSI * open_auto(int64_t need_size, int debug, int lverbose);
+extern int scsi_set_streaming(SCSI *usalp, caddr_t addr, int size);
#endif /* _SCSI_SCAN_H */
Modified: cdrkit/trunk/wodim/wodim.c
===================================================================
--- cdrkit/trunk/wodim/wodim.c 2008-01-30 20:50:51 UTC (rev 786)
+++ cdrkit/trunk/wodim/wodim.c 2008-02-25 11:14:07 UTC (rev 787)
@@ -4076,6 +4076,7 @@
#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)
@@ -4089,7 +4090,7 @@
read_scsi(usalp, buf, 1000, 1);
printf("XXX:\n");
- write(1, buf, 512);
+ ret = write(1, buf, 512);
unload_media(usalp, dp, flags);
comexit(0);
#endif
More information about the Debburn-changes
mailing list