From: Sean Purcell <me@seanp.xyz>
Date: Mon, 27 Feb 2017 06:27:31 +0000 (-0800)
Subject: Merge branch 'dev' into testcorpus
X-Git-Tag: v1.1.4~1^2~40^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F569%2Fhead;p=thirdparty%2Fzstd.git

Merge branch 'dev' into testcorpus
---

2302bfa4bf366497979f95ffcdda13bb0340ce9b
diff --cc tests/decodecorpus.c
index ecac7b234,8de5c252b..183d20f74
--- a/tests/decodecorpus.c
+++ b/tests/decodecorpus.c
@@@ -610,10 -610,9 +610,10 @@@ static U32 generateSequences(U32* seed
      /* The total length of all the matches */
      size_t const remainingMatch = contentSize - literalsSize;
      size_t excessMatch = 0;
 +    U32 numSequences = 0;
- 
++  
      U32 i;
  
 -    U32 numSequences;
  
      const BYTE* literals = LITERAL_BUFFER;
      BYTE* srcPtr = frame->src;