From 488a4d329da6d83d24bd9dae187cd026e67626c9 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 27 Feb 2008 09:15:13 +0000 Subject: [PATCH] - refined -Werror patch --- cdrkit-1.1.6-werror.patch | 381 +++++++++++++++----------------------- cdrkit.spec | 2 +- 2 files changed, 149 insertions(+), 234 deletions(-) diff --git a/cdrkit-1.1.6-werror.patch b/cdrkit-1.1.6-werror.patch index 22e05e4..485f024 100644 --- a/cdrkit-1.1.6-werror.patch +++ b/cdrkit-1.1.6-werror.patch @@ -1,6 +1,6 @@ -diff -up cdrkit-1.1.6.new/libhfs_iso/hfs.h.werror cdrkit-1.1.6.new/libhfs_iso/hfs.h ---- cdrkit-1.1.6.new/libhfs_iso/hfs.h.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/libhfs_iso/hfs.h 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/libhfs_iso/hfs.h.werror cdrkit-1.1.6/libhfs_iso/hfs.h +--- cdrkit-1.1.6/libhfs_iso/hfs.h.werror 2006-10-12 21:38:29.000000000 +0200 ++++ cdrkit-1.1.6/libhfs_iso/hfs.h 2008-02-27 10:09:20.000000000 +0100 @@ -29,6 +29,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -23,9 +23,9 @@ diff -up cdrkit-1.1.6.new/libhfs_iso/hfs.h.werror cdrkit-1.1.6.new/libhfs_iso/hf #endif /* APPLE_HYB */ + +#endif -diff -up cdrkit-1.1.6.new/libhfs_iso/hfs.c.werror cdrkit-1.1.6.new/libhfs_iso/hfs.c ---- cdrkit-1.1.6.new/libhfs_iso/hfs.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/libhfs_iso/hfs.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/libhfs_iso/hfs.c.werror cdrkit-1.1.6/libhfs_iso/hfs.c +--- cdrkit-1.1.6/libhfs_iso/hfs.c.werror 2006-12-08 14:38:43.000000000 +0100 ++++ cdrkit-1.1.6/libhfs_iso/hfs.c 2008-02-27 10:09:20.000000000 +0100 @@ -50,6 +50,7 @@ #include "node.h" #include "record.h" @@ -34,9 +34,9 @@ diff -up cdrkit-1.1.6.new/libhfs_iso/hfs.c.werror cdrkit-1.1.6.new/libhfs_iso/hf /* High-Level Volume Routines ============================================== */ -diff -up cdrkit-1.1.6.new/libusal/usal/usalops.h.werror cdrkit-1.1.6.new/libusal/usal/usalops.h ---- cdrkit-1.1.6.new/libusal/usal/usalops.h.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/libusal/usal/usalops.h 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/libusal/usal/usalops.h.werror cdrkit-1.1.6/libusal/usal/usalops.h +--- cdrkit-1.1.6/libusal/usal/usalops.h.werror 2007-04-10 17:01:46.000000000 +0200 ++++ cdrkit-1.1.6/libusal/usal/usalops.h 2008-02-27 10:09:20.000000000 +0100 @@ -76,6 +76,8 @@ typedef struct usal_ops { #define SCGO_ISATAPI(usalp) (*(usalp)->ops->usalo_isatapi)(usalp) #define SCGO_RESET(usalp, what) (*(usalp)->ops->usalo_reset)(usalp, what) @@ -46,9 +46,9 @@ diff -up cdrkit-1.1.6.new/libusal/usal/usalops.h.werror cdrkit-1.1.6.new/libusal #ifdef __cplusplus } #endif -diff -up cdrkit-1.1.6.new/libusal/scsi-linux-ata.c.werror cdrkit-1.1.6.new/libusal/scsi-linux-ata.c ---- cdrkit-1.1.6.new/libusal/scsi-linux-ata.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/libusal/scsi-linux-ata.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/libusal/scsi-linux-ata.c.werror cdrkit-1.1.6/libusal/scsi-linux-ata.c +--- cdrkit-1.1.6/libusal/scsi-linux-ata.c.werror 2006-12-08 14:38:43.000000000 +0100 ++++ cdrkit-1.1.6/libusal/scsi-linux-ata.c 2008-02-27 10:09:20.000000000 +0100 @@ -258,7 +258,7 @@ openbydev: starget, slun; @@ -84,15 +84,15 @@ diff -up cdrkit-1.1.6.new/libusal/scsi-linux-ata.c.werror cdrkit-1.1.6.new/libus if (sp->sense_len > sizeof (sense_cgc)) sense_cgc.add_sense_len = sizeof (sense_cgc) - 8; -diff -up cdrkit-1.1.6.new/libusal/scsi-linux-sg.c.werror cdrkit-1.1.6.new/libusal/scsi-linux-sg.c ---- cdrkit-1.1.6.new/libusal/scsi-linux-sg.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/libusal/scsi-linux-sg.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/libusal/scsi-linux-sg.c.werror cdrkit-1.1.6/libusal/scsi-linux-sg.c +--- cdrkit-1.1.6/libusal/scsi-linux-sg.c.werror 2008-02-27 10:09:20.000000000 +0100 ++++ cdrkit-1.1.6/libusal/scsi-linux-sg.c 2008-02-27 10:12:27.000000000 +0100 @@ -181,7 +181,7 @@ typedef struct { 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]; ++ char *filenames[MAX_SCG][MAX_TGT][MAX_LUN]; short buscookies[MAX_SCG]; int pgbus; int pack_id; /* Should be a random number */ @@ -191,14 +191,14 @@ diff -up cdrkit-1.1.6.new/libusal/scsi-linux-sg.c.werror cdrkit-1.1.6.new/libusa char *cut, *ende; char buf[64]; cut=strstr(globbuf.gl_pathv[i], "/device/")+4; -diff -up cdrkit-1.1.6.new/libusal/scsierrs.c.werror cdrkit-1.1.6.new/libusal/scsierrs.c ---- cdrkit-1.1.6.new/libusal/scsierrs.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/libusal/scsierrs.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/libusal/scsierrs.c.werror cdrkit-1.1.6/libusal/scsierrs.c +--- cdrkit-1.1.6/libusal/scsierrs.c.werror 2006-12-08 14:38:43.000000000 +0100 ++++ cdrkit-1.1.6/libusal/scsierrs.c 2008-02-27 10:09:20.000000000 +0100 @@ -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 ++#if 0 /* * Map old non extended sense to sense key. */ @@ -214,7 +214,7 @@ diff -up cdrkit-1.1.6.new/libusal/scsierrs.c.werror cdrkit-1.1.6.new/libusal/scs "Reserved" /* 0x0f */ }; -+#ifdef ABC ++#if 0 static char *sd_cmds[] = { "\000test unit ready", /* 0x00 */ "\001rezero", /* 0x01 */ @@ -227,9 +227,9 @@ diff -up cdrkit-1.1.6.new/libusal/scsierrs.c.werror cdrkit-1.1.6.new/libusal/scs const char * usal_sensemsg(register int ctype, register int code, register int qual, -diff -up cdrkit-1.1.6.new/libusal/scsitransp.c.werror cdrkit-1.1.6.new/libusal/scsitransp.c ---- cdrkit-1.1.6.new/libusal/scsitransp.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/libusal/scsitransp.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/libusal/scsitransp.c.werror cdrkit-1.1.6/libusal/scsitransp.c +--- cdrkit-1.1.6/libusal/scsitransp.c.werror 2007-04-09 00:09:51.000000000 +0200 ++++ cdrkit-1.1.6/libusal/scsitransp.c 2008-02-27 10:09:20.000000000 +0100 @@ -1154,7 +1154,7 @@ usal_sense_table(SCSI *usalp) return (0); @@ -239,9 +239,9 @@ diff -up cdrkit-1.1.6.new/libusal/scsitransp.c.werror cdrkit-1.1.6.new/libusal/s } -diff -up cdrkit-1.1.6.new/icedax/toc.c.werror cdrkit-1.1.6.new/icedax/toc.c ---- cdrkit-1.1.6.new/icedax/toc.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/icedax/toc.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/icedax/toc.c.werror cdrkit-1.1.6/icedax/toc.c +--- cdrkit-1.1.6/icedax/toc.c.werror 2007-01-06 04:19:16.000000000 +0100 ++++ cdrkit-1.1.6/icedax/toc.c 2008-02-27 10:09:20.000000000 +0100 @@ -864,7 +864,7 @@ int process_cddb_titles(int sock_fd, cha int finished = 0; char *p = inbuff; @@ -269,20 +269,18 @@ diff -up cdrkit-1.1.6.new/icedax/toc.c.werror cdrkit-1.1.6.new/icedax/toc.c /* skip the delimiter */ q += 3; clen = p - q; -@@ -1070,8 +1070,9 @@ static int handle_userchoice(char *p, un - +@@ -1071,7 +1071,7 @@ static int handle_userchoice(char *p, un /* get user response. */ do { -+ int ret; fprintf(stderr, "please choose one (0-%u): ", nr); - scanf("%u", &user_choice); -+ ret = scanf("%u", &user_choice); ++ scanf("%u", &user_choice); /* FIXME: check return value */ } while (user_choice > nr); if (user_choice == nr) -diff -up cdrkit-1.1.6.new/wodim/scsi_scan.h.werror cdrkit-1.1.6.new/wodim/scsi_scan.h ---- cdrkit-1.1.6.new/wodim/scsi_scan.h.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/wodim/scsi_scan.h 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/wodim/scsi_scan.h.werror cdrkit-1.1.6/wodim/scsi_scan.h +--- cdrkit-1.1.6/wodim/scsi_scan.h.werror 2007-05-04 02:45:51.000000000 +0200 ++++ cdrkit-1.1.6/wodim/scsi_scan.h 2008-02-27 10:09:20.000000000 +0100 @@ -39,5 +39,6 @@ extern int select_target(SCSI *usalp, FILE *f); extern int list_devices(SCSI *usalp, FILE *f, int pickup_type); @@ -290,9 +288,9 @@ diff -up cdrkit-1.1.6.new/wodim/scsi_scan.h.werror cdrkit-1.1.6.new/wodim/scsi_s +extern int scsi_set_streaming(SCSI *usalp, caddr_t addr, int size); #endif /* _SCSI_SCAN_H */ -diff -up cdrkit-1.1.6.new/wodim/scsi_cdr.c.werror cdrkit-1.1.6.new/wodim/scsi_cdr.c ---- cdrkit-1.1.6.new/wodim/scsi_cdr.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/wodim/scsi_cdr.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/wodim/scsi_cdr.c.werror cdrkit-1.1.6/wodim/scsi_cdr.c +--- cdrkit-1.1.6/wodim/scsi_cdr.c.werror 2006-12-29 16:07:44.000000000 +0100 ++++ cdrkit-1.1.6/wodim/scsi_cdr.c 2008-02-27 10:09:20.000000000 +0100 @@ -63,6 +63,7 @@ #include "scsimmc.h" @@ -301,29 +299,21 @@ diff -up cdrkit-1.1.6.new/wodim/scsi_cdr.c.werror cdrkit-1.1.6.new/wodim/scsi_cd #define strbeg(s1, s2) (strstr((s2), (s1)) == (s2)) -diff -up cdrkit-1.1.6.new/wodim/wodim.c.werror cdrkit-1.1.6.new/wodim/wodim.c ---- cdrkit-1.1.6.new/wodim/wodim.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/wodim/wodim.c 2008-02-27 09:37:52.000000000 +0100 -@@ -4076,6 +4076,7 @@ audioread(SCSI *usalp, cdr_t *dp, int fl - #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 @@ audioread(SCSI *usalp, cdr_t *dp, int fl +diff -up cdrkit-1.1.6/wodim/wodim.c.werror cdrkit-1.1.6/wodim/wodim.c +--- cdrkit-1.1.6/wodim/wodim.c.werror 2008-02-27 10:09:20.000000000 +0100 ++++ cdrkit-1.1.6/wodim/wodim.c 2008-02-27 10:09:20.000000000 +0100 +@@ -4089,7 +4089,7 @@ audioread(SCSI *usalp, cdr_t *dp, int fl read_scsi(usalp, buf, 1000, 1); printf("XXX:\n"); - write(1, buf, 512); -+ ret = write(1, buf, 512); ++ write(1, buf, 512); /* FIXME: handle return value */ unload_media(usalp, dp, flags); comexit(0); #endif -diff -up cdrkit-1.1.6.new/wodim/drv_mmc.c.werror cdrkit-1.1.6.new/wodim/drv_mmc.c ---- cdrkit-1.1.6.new/wodim/drv_mmc.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/wodim/drv_mmc.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/wodim/drv_mmc.c.werror cdrkit-1.1.6/wodim/drv_mmc.c +--- cdrkit-1.1.6/wodim/drv_mmc.c.werror 2007-05-06 12:23:54.000000000 +0200 ++++ cdrkit-1.1.6/wodim/drv_mmc.c 2008-02-27 10:09:20.000000000 +0100 @@ -59,6 +59,7 @@ #include "scsimmc.h" #include "mmcvendor.h" @@ -332,30 +322,31 @@ diff -up cdrkit-1.1.6.new/wodim/drv_mmc.c.werror cdrkit-1.1.6.new/wodim/drv_mmc. extern char *driveropts; -@@ -165,6 +166,8 @@ static int do_tattoo_yamaha(SCSI *usalp - static int yamaha_write_buffer(SCSI *usalp, int mode, int bufferid, long offset, +@@ -166,6 +167,9 @@ static int yamaha_write_buffer(SCSI *us 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); -+extern int scsi_format(SCSI *usalp, caddr_t addr, int size, BOOL background); ++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 -@@ -2851,9 +2854,9 @@ extern char *buf; + mmc_load(SCSI *usalp, cdr_t *dp) +@@ -2851,9 +2855,9 @@ extern char *buf; flush(); } if (formattype == FULL_FORMAT) { - ret = scsi_format(usalp, &addr, sizeof(addr), FALSE); -+ ret = scsi_format(usalp, (caddr_t)&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); ++ ret = scsi_format(usalp, (caddr_t)&addr, sizeof(addr), TRUE); } if (ret < 0) return (ret); -diff -up cdrkit-1.1.6.new/wodim/scsi_scan.c.werror cdrkit-1.1.6.new/wodim/scsi_scan.c ---- cdrkit-1.1.6.new/wodim/scsi_scan.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/wodim/scsi_scan.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/wodim/scsi_scan.c.werror cdrkit-1.1.6/wodim/scsi_scan.c +--- cdrkit-1.1.6/wodim/scsi_scan.c.werror 2007-05-04 09:31:20.000000000 +0200 ++++ cdrkit-1.1.6/wodim/scsi_scan.c 2008-02-27 10:09:20.000000000 +0100 @@ -50,6 +50,9 @@ #include #include @@ -375,22 +366,21 @@ diff -up cdrkit-1.1.6.new/wodim/scsi_scan.c.werror cdrkit-1.1.6.new/wodim/scsi_s usalp->silent++; -diff -up cdrkit-1.1.6.new/wodim/isosize.c.werror cdrkit-1.1.6.new/wodim/isosize.c ---- cdrkit-1.1.6.new/wodim/isosize.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/wodim/isosize.c 2008-02-27 09:37:52.000000000 +0100 -@@ -69,7 +69,8 @@ isosize(int f) +diff -up cdrkit-1.1.6/wodim/isosize.c.werror cdrkit-1.1.6/wodim/isosize.c +--- cdrkit-1.1.6/wodim/isosize.c.werror 2006-12-08 14:38:43.000000000 +0100 ++++ cdrkit-1.1.6/wodim/isosize.c 2008-02-27 10:09:20.000000000 +0100 +@@ -69,7 +69,7 @@ isosize(int f) vp = (struct iso9660_pr_voldesc *) &vd; do { - read(f, &vd, sizeof (vd)); -+ 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; -diff -up cdrkit-1.1.6.new/genisoimage/jte.c.werror cdrkit-1.1.6.new/genisoimage/jte.c ---- cdrkit-1.1.6.new/genisoimage/jte.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/genisoimage/jte.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/genisoimage/jte.c.werror cdrkit-1.1.6/genisoimage/jte.c +--- cdrkit-1.1.6/genisoimage/jte.c.werror 2006-12-10 23:02:28.000000000 +0100 ++++ cdrkit-1.1.6/genisoimage/jte.c 2008-02-27 10:09:20.000000000 +0100 @@ -531,13 +531,13 @@ static void parse_md5_list(void) } @@ -409,46 +399,9 @@ diff -up cdrkit-1.1.6.new/genisoimage/jte.c.werror cdrkit-1.1.6.new/genisoimage/ if (mk_MD5Parse(buf, md5)) { -@@ -849,7 +849,7 @@ void write_jt_footer(void) - /* And calculate the image size */ - image_size = (unsigned long long)SECTOR_SIZE * last_extent_written; - -- write_template_desc_entries(image_size, md5); -+ write_template_desc_entries(image_size, (char *)md5); - - write_jigdo_file(); - } -@@ -989,8 +989,8 @@ void write_jt_match_record(char *filenam - #endif - } - if (first_block) -- rsync64_sum = rsync64(buf, MIN_JIGDO_FILE_SIZE); -- mk_MD5Update(&iso_context, buf, use); -+ rsync64_sum = rsync64((unsigned char *)buf, MIN_JIGDO_FILE_SIZE); -+ mk_MD5Update(&iso_context, (unsigned char *)buf, use); - remain -= use; - first_block = 0; - } -@@ -1002,14 +1002,14 @@ void write_jt_match_record(char *filenam - { - int pad_size = sector_size - (size % sector_size); - memset(buf, 0, pad_size); -- mk_MD5Update(&iso_context, buf, pad_size); -+ mk_MD5Update(&iso_context, (unsigned char *)buf, pad_size); - } - - add_file_entry(mirror_name, size, &md5[0], rsync64_sum); - if (size % sector_size) - { - int pad_size = sector_size - (size % sector_size); -- write_compressed_chunk(buf, pad_size); -+ write_compressed_chunk((unsigned char *)buf, pad_size); - add_unmatched_entry(pad_size); - } - } -diff -up cdrkit-1.1.6.new/genisoimage/boot-mips.c.werror cdrkit-1.1.6.new/genisoimage/boot-mips.c ---- cdrkit-1.1.6.new/genisoimage/boot-mips.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/genisoimage/boot-mips.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/genisoimage/boot-mips.c.werror cdrkit-1.1.6/genisoimage/boot-mips.c +--- cdrkit-1.1.6/genisoimage/boot-mips.c.werror 2006-11-23 23:11:41.000000000 +0100 ++++ cdrkit-1.1.6/genisoimage/boot-mips.c 2008-02-27 10:09:20.000000000 +0100 @@ -310,7 +310,7 @@ static int boot_mips_write(FILE *outfile length = ((get_733(boot_file->isorec.size) + 2047) / 2048) * 2048; filename = file_base_name(boot_mips_filename[i]); @@ -458,9 +411,9 @@ diff -up cdrkit-1.1.6.new/genisoimage/boot-mips.c.werror cdrkit-1.1.6.new/geniso write_be32(extent, (unsigned char *)&vh.vh_vd[i].vd_lbn); write_be32(length, (unsigned char *)&vh.vh_vd[i].vd_nbytes); -diff -up cdrkit-1.1.6.new/genisoimage/tree.c.werror cdrkit-1.1.6.new/genisoimage/tree.c ---- cdrkit-1.1.6.new/genisoimage/tree.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/genisoimage/tree.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/genisoimage/tree.c.werror cdrkit-1.1.6/genisoimage/tree.c +--- cdrkit-1.1.6/genisoimage/tree.c.werror 2008-02-27 10:09:20.000000000 +0100 ++++ cdrkit-1.1.6/genisoimage/tree.c 2008-02-27 10:09:20.000000000 +0100 @@ -41,6 +41,7 @@ #include #include "genisoimage.h" @@ -469,9 +422,9 @@ diff -up cdrkit-1.1.6.new/genisoimage/tree.c.werror cdrkit-1.1.6.new/genisoimage #include "exclude.h" #include #include -diff -up cdrkit-1.1.6.new/genisoimage/multi.c.werror cdrkit-1.1.6.new/genisoimage/multi.c ---- cdrkit-1.1.6.new/genisoimage/multi.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/genisoimage/multi.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/genisoimage/multi.c.werror cdrkit-1.1.6/genisoimage/multi.c +--- cdrkit-1.1.6/genisoimage/multi.c.werror 2007-03-14 22:14:33.000000000 +0100 ++++ cdrkit-1.1.6/genisoimage/multi.c 2008-02-27 10:09:20.000000000 +0100 @@ -1064,7 +1064,7 @@ check_prev_session(struct directory_entr } /* We found it and we can reuse the extent */ @@ -481,9 +434,9 @@ diff -up cdrkit-1.1.6.new/genisoimage/multi.c.werror cdrkit-1.1.6.new/genisoimag curr_entry->de_flags |= SAFE_TO_REUSE_TABLE_ENTRY; goto found_it; } -diff -up cdrkit-1.1.6.new/genisoimage/genisoimage.c.werror cdrkit-1.1.6.new/genisoimage/genisoimage.c ---- cdrkit-1.1.6.new/genisoimage/genisoimage.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/genisoimage/genisoimage.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/genisoimage/genisoimage.c.werror cdrkit-1.1.6/genisoimage/genisoimage.c +--- cdrkit-1.1.6/genisoimage/genisoimage.c.werror 2007-03-17 12:59:16.000000000 +0100 ++++ cdrkit-1.1.6/genisoimage/genisoimage.c 2008-02-27 10:09:20.000000000 +0100 @@ -2451,8 +2451,8 @@ parse_input_files: if (stream_filename) { if (strlen(stream_filename) > MAX_ISONAME) @@ -495,30 +448,29 @@ diff -up cdrkit-1.1.6.new/genisoimage/genisoimage.c.werror cdrkit-1.1.6.new/geni if (strchr(stream_filename, '/')) comerrno(EX_BAD, "Illegal character '/' in stream-file-name.\n"); iso9660_level = 4; -diff -up cdrkit-1.1.6.new/genisoimage/eltorito.c.werror cdrkit-1.1.6.new/genisoimage/eltorito.c ---- cdrkit-1.1.6.new/genisoimage/eltorito.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/genisoimage/eltorito.c 2008-02-27 09:37:52.000000000 +0100 -@@ -600,7 +600,7 @@ fill_boot_desc(struct eltorito_defaultbo +diff -up cdrkit-1.1.6/genisoimage/eltorito.c.werror cdrkit-1.1.6/genisoimage/eltorito.c +--- cdrkit-1.1.6/genisoimage/eltorito.c.werror 2007-05-03 12:01:20.000000000 +0200 ++++ cdrkit-1.1.6/genisoimage/eltorito.c 2008-02-27 10:09:20.000000000 +0100 +@@ -600,7 +600,6 @@ fill_boot_desc(struct eltorito_defaultbo 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 @@ fill_boot_desc(struct eltorito_defaultbo +@@ -661,7 +660,7 @@ fill_boot_desc(struct eltorito_defaultbo 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)); ++ write(bootimage, &bi_table, sizeof (bi_table)); /* FIXME: check return value */ close(bootimage); } }/* fill_boot_desc(... */ -diff -up cdrkit-1.1.6.new/genisoimage/boot-hppa.c.werror cdrkit-1.1.6.new/genisoimage/boot-hppa.c ---- cdrkit-1.1.6.new/genisoimage/boot-hppa.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/genisoimage/boot-hppa.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/genisoimage/boot-hppa.c.werror cdrkit-1.1.6/genisoimage/boot-hppa.c +--- cdrkit-1.1.6/genisoimage/boot-hppa.c.werror 2006-12-30 16:46:49.000000000 +0100 ++++ cdrkit-1.1.6/genisoimage/boot-hppa.c 2008-02-27 10:09:20.000000000 +0100 @@ -177,7 +177,7 @@ static int boot_hppa_write(FILE *outfile write_be32(length, &boot_sector[20]); @@ -528,9 +480,9 @@ diff -up cdrkit-1.1.6.new/genisoimage/boot-hppa.c.werror cdrkit-1.1.6.new/geniso /* Find the dir entry for the 64-bit kernel by walking our file list */ boot_file = search_tree_file(root, hppa_kernel_64); -diff -up cdrkit-1.1.6.new/genisoimage/joliet.c.werror cdrkit-1.1.6.new/genisoimage/joliet.c ---- cdrkit-1.1.6.new/genisoimage/joliet.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/genisoimage/joliet.c 2008-02-27 09:38:18.000000000 +0100 +diff -up cdrkit-1.1.6/genisoimage/joliet.c.werror cdrkit-1.1.6/genisoimage/joliet.c +--- cdrkit-1.1.6/genisoimage/joliet.c.werror 2007-03-14 22:14:33.000000000 +0100 ++++ cdrkit-1.1.6/genisoimage/joliet.c 2008-02-27 10:09:20.000000000 +0100 @@ -97,6 +97,7 @@ #include #include /* For UNICODE translation */ @@ -546,170 +498,142 @@ diff -up cdrkit-1.1.6.new/genisoimage/joliet.c.werror cdrkit-1.1.6.new/genisoima - char *inptr = tmpbuf; - char *outptr = buffer; - size_t inleft = strlen(tmpbuf); -+ char *inptr = (char *)tmpbuf; ++ char *inptr = (char *)tmpbuf; + char *outptr = (char *)buffer; + size_t inleft = strlen((char *)tmpbuf); size_t inlen = inleft; size_t outleft = size; -diff -up cdrkit-1.1.6.new/genisoimage/md5.c.werror cdrkit-1.1.6.new/genisoimage/md5.c ---- cdrkit-1.1.6.new/genisoimage/md5.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/genisoimage/md5.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/genisoimage/md5.c.werror cdrkit-1.1.6/genisoimage/md5.c +--- cdrkit-1.1.6/genisoimage/md5.c.werror 2006-10-12 21:38:29.000000000 +0200 ++++ cdrkit-1.1.6/genisoimage/md5.c 2008-02-27 10:09:20.000000000 +0100 @@ -352,15 +352,15 @@ int calculate_md5sum(char *filename, uns remain = size; while (remain > 0) { - use = (remain > sizeof(buffer) ? sizeof(buffer) : remain); - if (fread(buffer, 1, use, infile) == 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; -+ fprintf(stderr, "cannot read from '%s'\n", filename); -+ exit(1); ++ 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; ++ /* Update the checksum */ ++ mk_MD5Update(&file_context, (unsigned char *)buffer, use); ++ remain -= use; } fclose(infile); mk_MD5Final(&out[0], &file_context); -diff -up cdrkit-1.1.6.new/genisoimage/diag/isovfy.c.werror cdrkit-1.1.6.new/genisoimage/diag/isovfy.c ---- cdrkit-1.1.6.new/genisoimage/diag/isovfy.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/genisoimage/diag/isovfy.c 2008-02-27 09:37:52.000000000 +0100 -@@ -583,6 +583,7 @@ check_path_tables(int typel_extent, int - char *pnt; - char *typel; - char *typem; -+ int ret; - - /* Now read in the path tables */ - -@@ -591,11 +592,11 @@ check_path_tables(int typel_extent, int +diff -up cdrkit-1.1.6/genisoimage/diag/isovfy.c.werror cdrkit-1.1.6/genisoimage/diag/isovfy.c +--- cdrkit-1.1.6/genisoimage/diag/isovfy.c.werror 2006-12-08 14:38:43.000000000 +0100 ++++ cdrkit-1.1.6/genisoimage/diag/isovfy.c 2008-02-27 10:09:20.000000000 +0100 +@@ -591,11 +591,11 @@ check_path_tables(int typel_extent, int 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); ++ 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); - read(fileno(infile), typem, path_table_size); -+ 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; -diff -up cdrkit-1.1.6.new/genisoimage/diag/isodump.c.werror cdrkit-1.1.6.new/genisoimage/diag/isodump.c ---- cdrkit-1.1.6.new/genisoimage/diag/isodump.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/genisoimage/diag/isodump.c 2008-02-27 09:37:52.000000000 +0100 -@@ -652,10 +652,11 @@ main(int argc, char *argv[]) - on_comerr((void(*)(int, void *))reset_tty, NULL); - - do { -+ int ret; +diff -up cdrkit-1.1.6/genisoimage/diag/isodump.c.werror cdrkit-1.1.6/genisoimage/diag/isodump.c +--- cdrkit-1.1.6/genisoimage/diag/isodump.c.werror 2006-12-08 14:38:43.000000000 +0100 ++++ cdrkit-1.1.6/genisoimage/diag/isodump.c 2008-02-27 10:09:20.000000000 +0100 +@@ -655,7 +655,7 @@ main(int argc, char *argv[]) if (file_addr < 0) file_addr = (off_t)0; showblock(1); - read(STDIN_FILENO, &c, 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') -@@ -665,11 +666,11 @@ main(int argc, char *argv[]) +@@ -665,11 +665,11 @@ main(int argc, char *argv[]) printf("Enter new starting block (in hex):"); if (sizeof (file_addr) > sizeof (long)) { Llong ll; - scanf("%llx", &ll); -+ ret = scanf("%llx", &ll); ++ scanf("%llx", &ll); /* FIXME: check return value */ file_addr = (off_t)ll; } else { long l; - scanf("%lx", &l); -+ ret = scanf("%lx", &l); ++ scanf("%lx", &l); /* FIXME: check return value */ file_addr = (off_t)l; } file_addr = file_addr * blocksize; -@@ -677,9 +678,10 @@ main(int argc, char *argv[]) - printf(" "); - } +@@ -679,7 +679,7 @@ main(int argc, char *argv[]) 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); ++ 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); -diff -up cdrkit-1.1.6.new/genisoimage/diag/isoinfo.c.werror cdrkit-1.1.6.new/genisoimage/diag/isoinfo.c ---- cdrkit-1.1.6.new/genisoimage/diag/isoinfo.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/genisoimage/diag/isoinfo.c 2008-02-27 09:37:52.000000000 +0100 -@@ -641,6 +641,7 @@ extract_file(struct iso_directory_record - 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 @@ extract_file(struct iso_directory_record +diff -up cdrkit-1.1.6/genisoimage/diag/isoinfo.c.werror cdrkit-1.1.6/genisoimage/diag/isoinfo.c +--- cdrkit-1.1.6/genisoimage/diag/isoinfo.c.werror 2006-12-08 14:38:43.000000000 +0100 ++++ cdrkit-1.1.6/genisoimage/diag/isoinfo.c 2008-02-27 10:09:20.000000000 +0100 +@@ -651,7 +651,7 @@ extract_file(struct iso_directory_record #endif len -= tlen; extent++; - write(STDOUT_FILENO, buff, tlen); -+ ret = write(STDOUT_FILENO, buff, tlen); ++ write(STDOUT_FILENO, buff, tlen); /* FIXME: check return value */ } } -diff -up cdrkit-1.1.6.new/genisoimage/diag/dump.c.werror cdrkit-1.1.6.new/genisoimage/diag/dump.c ---- cdrkit-1.1.6.new/genisoimage/diag/dump.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/genisoimage/diag/dump.c 2008-02-27 09:37:52.000000000 +0100 -@@ -366,9 +366,10 @@ main(int argc, char *argv[]) - on_comerr((void(*)(int, void *))reset_tty, NULL); - +diff -up cdrkit-1.1.6/genisoimage/diag/dump.c.werror cdrkit-1.1.6/genisoimage/diag/dump.c +--- cdrkit-1.1.6/genisoimage/diag/dump.c.werror 2006-12-08 14:38:43.000000000 +0100 ++++ cdrkit-1.1.6/genisoimage/diag/dump.c 2008-02-27 10:09:20.000000000 +0100 +@@ -368,7 +368,7 @@ main(int argc, char *argv[]) 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); ++ read(STDIN_FILENO, &c, 1); /* FIXME: check return value */ if (c == 'a') file_addr -= PAGE; if (c == 'b') -@@ -378,11 +379,11 @@ main(int argc, char *argv[]) +@@ -378,11 +378,11 @@ main(int argc, char *argv[]) printf("Enter new starting block (in hex):"); if (sizeof (file_addr) > sizeof (long)) { Llong ll; - scanf("%llx", &ll); -+ ret = scanf("%llx", &ll); ++ scanf("%llx", &ll); /* FIXME: check return value */ file_addr = (off_t)ll; } else { long l; - scanf("%lx", &l); -+ ret = scanf("%lx", &l); ++ scanf("%lx", &l); /* FIXME: check return value */ file_addr = (off_t)l; } file_addr = file_addr << 11; -@@ -390,9 +391,10 @@ main(int argc, char *argv[]) - printf(" "); - } +@@ -392,7 +392,7 @@ main(int argc, char *argv[]) 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); ++ 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); -diff -up cdrkit-1.1.6.new/genisoimage/write.c.werror cdrkit-1.1.6.new/genisoimage/write.c ---- cdrkit-1.1.6.new/genisoimage/write.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/genisoimage/write.c 2008-02-27 09:47:37.000000000 +0100 +diff -up cdrkit-1.1.6/genisoimage/write.c.werror cdrkit-1.1.6/genisoimage/write.c +--- cdrkit-1.1.6/genisoimage/write.c.werror 2007-03-14 22:14:33.000000000 +0100 ++++ cdrkit-1.1.6/genisoimage/write.c 2008-02-27 10:09:20.000000000 +0100 @@ -303,7 +303,8 @@ xfwrite(void *buffer, int size, int coun * which is wrong this code. (void *) introduces a compatible * intermediate type in the cast list. @@ -732,9 +656,9 @@ diff -up cdrkit-1.1.6.new/genisoimage/write.c.werror cdrkit-1.1.6.new/genisoimag if (s_entry->inode != TABLE_INODE) { fprintf(stderr, "%s\n", s_entry->whole_name); -diff -up cdrkit-1.1.6.new/librols/fexec.c.werror cdrkit-1.1.6.new/librols/fexec.c ---- cdrkit-1.1.6.new/librols/fexec.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/librols/fexec.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/librols/fexec.c.werror cdrkit-1.1.6/librols/fexec.c +--- cdrkit-1.1.6/librols/fexec.c.werror 2006-09-05 10:39:04.000000000 +0200 ++++ cdrkit-1.1.6/librols/fexec.c 2008-02-27 10:09:20.000000000 +0100 @@ -204,6 +204,8 @@ fexecve(name, in, out, err, av, env) int o[3]; int f[3]; @@ -744,9 +668,9 @@ diff -up cdrkit-1.1.6.new/librols/fexec.c.werror cdrkit-1.1.6.new/librols/fexec. #endif fflush(out); -diff -up cdrkit-1.1.6.new/librols/default.c.werror cdrkit-1.1.6.new/librols/default.c ---- cdrkit-1.1.6.new/librols/default.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/librols/default.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/librols/default.c.werror cdrkit-1.1.6/librols/default.c +--- cdrkit-1.1.6/librols/default.c.werror 2006-12-08 11:15:57.000000000 +0100 ++++ cdrkit-1.1.6/librols/default.c 2008-02-27 10:09:20.000000000 +0100 @@ -56,7 +56,7 @@ static char *get_value(FILE *srcfile, co next_line: while(fgets(linebuf, sizeof(linebuf)-1, srcfile)) { @@ -756,33 +680,23 @@ diff -up cdrkit-1.1.6.new/librols/default.c.werror cdrkit-1.1.6.new/librols/defa int s=KEYBEGINSEARCH; char *ret=NULL; int lastchar=0; -diff -up cdrkit-1.1.6.new/librols/raisecond.c.werror cdrkit-1.1.6.new/librols/raisecond.c ---- cdrkit-1.1.6.new/librols/raisecond.c.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/librols/raisecond.c 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/librols/raisecond.c.werror cdrkit-1.1.6/librols/raisecond.c +--- cdrkit-1.1.6/librols/raisecond.c.werror 2006-09-05 10:39:04.000000000 +0200 ++++ cdrkit-1.1.6/librols/raisecond.c 2008-02-27 10:09:20.000000000 +0100 @@ -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) write(STDERR_FILENO, (a), sizeof (a)-1) -+#define eprintl(a) 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) -@@ -173,7 +173,8 @@ LOCAL void - raiseabort(signame) - const char *signame; - { -- eprints("Condition not caught: "); eprintl(signame); eprints(".\n"); -+ int a; -+ a=eprints("Condition not caught: "); a=eprintl(signame); a=eprints(".\n"); - abort(); - /* NOTREACHED */ - } -diff -up cdrkit-1.1.6.new/include/libport.h.werror cdrkit-1.1.6.new/include/libport.h ---- cdrkit-1.1.6.new/include/libport.h.werror 2008-02-27 09:37:52.000000000 +0100 -+++ cdrkit-1.1.6.new/include/libport.h 2008-02-27 09:37:52.000000000 +0100 +diff -up cdrkit-1.1.6/include/libport.h.werror cdrkit-1.1.6/include/libport.h +--- cdrkit-1.1.6/include/libport.h.werror 2006-10-12 21:38:29.000000000 +0200 ++++ cdrkit-1.1.6/include/libport.h 2008-02-27 10:09:20.000000000 +0100 @@ -67,9 +67,11 @@ /* Linux MAXHOSTNAMELEN */ #endif @@ -795,3 +709,4 @@ diff -up cdrkit-1.1.6.new/include/libport.h.werror cdrkit-1.1.6.new/include/libp #ifndef HOST_NAME_MAX #define HOST_NAME_MAX 255 +diff -up cdrkit-1.1.6/Changelog.werror cdrkit-1.1.6/Changelog diff --git a/cdrkit.spec b/cdrkit.spec index 291c824..f614055 100644 --- a/cdrkit.spec +++ b/cdrkit.spec @@ -76,7 +76,7 @@ rates. Icedax can also be used as a CD player. %patch2 -p1 -b .segf %patch3 -p1 -b .prtypo %patch4 -p1 -b .oldsyn -%patch5 -p1 -b .werror +%patch5 -p0 -b .werror find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g' find doc -type f -print0 | xargs -0 chmod a-x