cdrkit-1.1.11-werror_gcc5.patch 685 B

1234567891011121314151617181920212223
  1. diff -up wrk/genisoimage/exclude.c.wrk wrk/genisoimage/exclude.c
  2. --- wrk/genisoimage/exclude.c.wrk 2015-02-25 13:16:28.054237196 +0100
  3. +++ wrk/genisoimage/exclude.c 2015-02-25 13:33:06.761312002 +0100
  4. @@ -39,7 +39,7 @@ exclude(char *fn)
  5. {
  6. register int i;
  7. - for (i = 0; excl[i] && i < MAXEXCL; i++)
  8. + for (i = 0; i < MAXEXCL && excl[i]; i++)
  9. ;
  10. if (i == MAXEXCL) {
  11. @@ -69,7 +69,7 @@ is_excluded(char *fn)
  12. /*
  13. * very dumb search method ...
  14. */
  15. - for (i = 0; excl[i] && i < MAXEXCL; i++) {
  16. + for (i = 0; i < MAXEXCL && excl[i]; i++) {
  17. if (strcmp(excl[i], fn) == 0) {
  18. return (1); /* found -> excluded filenmae */
  19. }
  20. diff -up wrk/icedax/toc.c.wrk wrk/icedax/toc.c