diff options
| author | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2012-02-20 07:25:00 +0900 |
|---|---|---|
| committer | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2012-02-20 07:25:00 +0900 |
| commit | 01799b51a48d3fd4ac093b7dc73b209248e5f38f (patch) | |
| tree | 9f747617b1e3689b2d32e750f5d72c78b3b4a715 /libarchive/archive_match.c | |
| parent | 88145f44e754a9d551562428b92573d601a38d86 (diff) | |
| download | libarchive-01799b51a48d3fd4ac093b7dc73b209248e5f38f.tar.gz | |
Enable an aggressive warning C4706 on MSVC.
Diffstat (limited to 'libarchive/archive_match.c')
| -rw-r--r-- | libarchive/archive_match.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libarchive/archive_match.c b/libarchive/archive_match.c index f63d07bc..6b533e6b 100644 --- a/libarchive/archive_match.c +++ b/libarchive/archive_match.c @@ -694,8 +694,8 @@ path_excluded(struct archive_match *a, int mbs, const void *pathname) matched = NULL; for (match = a->inclusions.first; match != NULL; match = match->next){ - if (match->matches == 0 - && (r = match_path_inclusion(a, match, mbs, pathname))) { + if (match->matches == 0 && + (r = match_path_inclusion(a, match, mbs, pathname)) != 0) { if (r < 0) return (r); a->inclusions.unmatched_count--; @@ -722,8 +722,8 @@ path_excluded(struct archive_match *a, int mbs, const void *pathname) for (match = a->inclusions.first; match != NULL; match = match->next){ /* We looked at previously-unmatched inclusions already. */ - if (match->matches > 0 - && (r = match_path_inclusion(a, match, mbs, pathname))) { + if (match->matches > 0 && + (r = match_path_inclusion(a, match, mbs, pathname)) != 0) { if (r < 0) return (r); match->matches++; |