rpms/cdrkit/devel cdrkit-1.1.6-werror.patch, 1.4, 1.5 cdrkit.spec, 1.14, 1.15
Harald Hoyer (harald)
fedora-extras-commits at redhat.com
Wed Feb 27 09:46:15 UTC 2008
Author: harald
Update of /cvs/pkgs/rpms/cdrkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17922
Modified Files:
cdrkit-1.1.6-werror.patch cdrkit.spec
Log Message:
* Wed Feb 27 2008 Harald Hoyer <harald at redhat.com> 1.1.6-11
- refined -Werror patch
cdrkit-1.1.6-werror.patch:
Index: cdrkit-1.1.6-werror.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/devel/cdrkit-1.1.6-werror.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cdrkit-1.1.6-werror.patch 27 Feb 2008 09:15:13 -0000 1.4
+++ cdrkit-1.1.6-werror.patch 27 Feb 2008 09:46:01 -0000 1.5
@@ -274,7 +274,7 @@
do {
fprintf(stderr, "please choose one (0-%u): ", nr);
- scanf("%u", &user_choice);
-+ scanf("%u", &user_choice); /* FIXME: check return value */
++ do{int ret; ret=scanf("%u", &user_choice);}while(0); /* FIXME: check return value */
} while (user_choice > nr);
if (user_choice == nr)
@@ -307,7 +307,7 @@
read_scsi(usalp, buf, 1000, 1);
printf("XXX:\n");
- write(1, buf, 512);
-+ write(1, buf, 512); /* FIXME: handle return value */
++ do{int ret; ret=write(1, buf, 512);}while(0); /* FIXME: handle return value */
unload_media(usalp, dp, flags);
comexit(0);
#endif
@@ -374,13 +374,13 @@
do {
- read(f, &vd, sizeof (vd));
-+ read(f, &vd, sizeof (vd)); /* FIXME: check return value */
++ do{int ret; ret=read(f, &vd, sizeof (vd));}while(0); /* FIXME: check return value */
if (GET_UBYTE(vd.vd_type) == VD_PRIMARY)
break;
-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
+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
@@ -531,13 +531,13 @@ static void parse_md5_list(void)
}
@@ -399,6 +399,43 @@
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/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
@@ -464,7 +501,7 @@
set_731(bi_table.bi_csum, bi_checksum);
- write(bootimage, &bi_table, sizeof (bi_table));
-+ write(bootimage, &bi_table, sizeof (bi_table)); /* FIXME: check return value */
++ do{int ret;ret=write(bootimage, &bi_table, sizeof (bi_table));}while(0); /* FIXME: check return value */
close(bootimage);
}
}/* fill_boot_desc(... */
@@ -540,12 +577,12 @@
#else
lseek(fileno(infile), (off_t)((off_t)typel_extent) * blocksize, SEEK_SET);
- read(fileno(infile), typel, path_table_size);
-+ read(fileno(infile), typel, path_table_size); /* FIXME: check return value */
++ do{int ret;ret=read(fileno(infile), typel, path_table_size);}while(0); /* 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);
-+ read(fileno(infile), typem, path_table_size); /* FIXME: check return value */
++ do{int ret;ret=read(fileno(infile), typem, path_table_size);}while(0); /* FIXME: check return value */
j = path_table_size;
pnt = typel;
@@ -557,7 +594,7 @@
file_addr = (off_t)0;
showblock(1);
- read(STDIN_FILENO, &c, 1);
-+ read(STDIN_FILENO, &c, 1); /* FIXME: check return value */
++ do{int ret;ret=read(STDIN_FILENO, &c, 1);}while(0); /* FIXME: check return value */
if (c == 'a')
file_addr -= blocksize;
if (c == 'b')
@@ -566,12 +603,12 @@
if (sizeof (file_addr) > sizeof (long)) {
Llong ll;
- scanf("%llx", &ll);
-+ scanf("%llx", &ll); /* FIXME: check return value */
++ do{int ret;ret=scanf("%llx", &ll);}while(0); /* FIXME: check return value */
file_addr = (off_t)ll;
} else {
long l;
- scanf("%lx", &l);
-+ scanf("%lx", &l); /* FIXME: check return value */
++ do{int ret;ret=scanf("%lx", &l);}while(0); /* FIXME: check return value */
file_addr = (off_t)l;
}
file_addr = file_addr * blocksize;
@@ -580,7 +617,7 @@
crsr2(20, 1);
printf("Enter new search string:");
- fgets((char *)search, sizeof (search), stdin);
-+ fgets((char *)search, sizeof (search), stdin); /* FIXME: check return value */
++ do{char *ret;ret=fgets((char *)search, sizeof (search), stdin);}while(0); /* FIXME: check return value */
while (search[strlen((char *)search)-1] == '\n')
search[strlen((char *)search)-1] = 0;
crsr2(20, 1);
@@ -592,7 +629,7 @@
len -= tlen;
extent++;
- write(STDOUT_FILENO, buff, tlen);
-+ write(STDOUT_FILENO, buff, tlen); /* FIXME: check return value */
++ do{int ret;ret=write(STDOUT_FILENO, buff, tlen);}while(0); /* FIXME: check return value */
}
}
@@ -604,7 +641,7 @@
if (file_addr < (off_t)0) file_addr = (off_t)0;
showblock(1);
- read(STDIN_FILENO, &c, 1);
-+ read(STDIN_FILENO, &c, 1); /* FIXME: check return value */
++ do{int ret;ret=read(STDIN_FILENO, &c, 1);}while(0); /* FIXME: check return value */
if (c == 'a')
file_addr -= PAGE;
if (c == 'b')
@@ -613,12 +650,12 @@
if (sizeof (file_addr) > sizeof (long)) {
Llong ll;
- scanf("%llx", &ll);
-+ scanf("%llx", &ll); /* FIXME: check return value */
++ do{int ret;ret=scanf("%llx", &ll);}while(0); /* FIXME: check return value */
file_addr = (off_t)ll;
} else {
long l;
- scanf("%lx", &l);
-+ scanf("%lx", &l); /* FIXME: check return value */
++ do{int ret;ret=scanf("%lx", &l);}while(0); /* FIXME: check return value */
file_addr = (off_t)l;
}
file_addr = file_addr << 11;
@@ -627,7 +664,7 @@
crsr2(20, 1);
printf("Enter new search string:");
- fgets((char *)search, sizeof (search), stdin);
-+ fgets((char *)search, sizeof (search), stdin); /* FIXME: check return value */
++ do{char *ret;ret=fgets((char *)search, sizeof (search), stdin);}while(0); /* FIXME: check return value */
while (search[strlen((char *)search)-1] == '\n')
search[strlen((char *)search)-1] = 0;
crsr2(20, 1);
Index: cdrkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrkit/devel/cdrkit.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cdrkit.spec 27 Feb 2008 09:15:13 -0000 1.14
+++ cdrkit.spec 27 Feb 2008 09:46:01 -0000 1.15
@@ -76,7 +76,7 @@
%patch2 -p1 -b .segf
%patch3 -p1 -b .prtypo
%patch4 -p1 -b .oldsyn
-%patch5 -p0 -b .werror
+%patch5 -p1 -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
@@ -84,7 +84,7 @@
%build
mkdir fedora
cd fedora
-export CFLAGS="$RPM_OPT_FLAGS -Werror -Wno-unused-function -Wno-unused-variable"
+export CFLAGS="$RPM_OPT_FLAGS -Wall -Werror -Wno-unused-function -Wno-unused-variable"
export CXXFLAGS="$CFLAGS"
export FFLAGS="$CFLAGS"
cmake .. \
More information about the fedora-extras-commits
mailing list