]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/cdrkit/cdrkit-1.1.11-werror_gcc5.patch
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata
[ipfire-2.x.git] / src / patches / cdrkit / cdrkit-1.1.11-werror_gcc5.patch
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
8 - for (i = 0; excl[i] && i < MAXEXCL; i++)
9 + for (i = 0; i < MAXEXCL && excl[i]; i++)
10 ;
11
12 if (i == MAXEXCL) {
13 @@ -69,7 +69,7 @@ is_excluded(char *fn)
14 /*
15 * very dumb search method ...
16 */
17 - for (i = 0; excl[i] && i < MAXEXCL; i++) {
18 + for (i = 0; i < MAXEXCL && excl[i]; i++) {
19 if (strcmp(excl[i], fn) == 0) {
20 return (1); /* found -> excluded filenmae */
21 }
22 diff -up wrk/icedax/toc.c.wrk wrk/icedax/toc.c