From: Yann Collet <cyan@fb.com>
Date: Wed, 31 May 2017 17:03:20 +0000 (-0700)
Subject: Merge branch 'advancedAPI2' of github.com:facebook/zstd into advancedAPI2
X-Git-Tag: v1.3.0~1^2~17^2~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06589fe5168566ba1604c9362f06af68309214bf;p=thirdparty%2Fzstd.git

Merge branch 'advancedAPI2' of github.com:facebook/zstd into advancedAPI2
---

06589fe5168566ba1604c9362f06af68309214bf
diff --cc lib/compress/zstd_compress.c
index fa574a226,d57d909a7..ddbeaf56e
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@@ -3606,8 -3606,8 +3606,9 @@@ static size_t ZSTD_compressStream_gener
          case zcss_load:
              /* complete inBuffer */
              {   size_t const toLoad = zcs->inBuffTarget - zcs->inBuffPos;
--                size_t const loaded = ZSTD_limitCopy(zcs->inBuff + zcs->inBuffPos,
--                                                    toLoad, ip, iend-ip);
++                size_t const loaded = ZSTD_limitCopy(
++                                        zcs->inBuff + zcs->inBuffPos, toLoad,
++                                        ip, iend-ip);
                  zcs->inBuffPos += loaded;
                  ip += loaded;
                  if ( (flushMode == ZSTD_e_continue)