Skip to content

Commit cef02d9

Browse files
committed
changed variable name, for clarity
fhiPtr -> zfhPtr facebook#689 (comment)
1 parent 669346f commit cef02d9

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

doc/zstd_manual.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ <h3>Buffer-less streaming compression functions</h3><pre></pre><b><pre>size_t ZS
646646
It also returns Frame Size as fparamsPtr->frameContentSize.
647647
<BR></pre>
648648

649-
<h3>Buffer-less streaming decompression functions</h3><pre></pre><b><pre>size_t ZSTD_getFrameHeader(ZSTD_frameHeader* fparamsPtr, const void* src, size_t srcSize); </b>/**< doesn't consume input, see details below */<b>
649+
<h3>Buffer-less streaming decompression functions</h3><pre></pre><b><pre>size_t ZSTD_getFrameHeader(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize); </b>/**< doesn't consume input, see details below */<b>
650650
size_t ZSTD_decompressBegin(ZSTD_DCtx* dctx);
651651
size_t ZSTD_decompressBegin_usingDict(ZSTD_DCtx* dctx, const void* dict, size_t dictSize);
652652
void ZSTD_copyDCtx(ZSTD_DCtx* dctx, const ZSTD_DCtx* preparedDCtx);

lib/decompress/zstd_decompress.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,10 @@ static size_t ZSTD_frameHeaderSize(const void* src, size_t srcSize)
221221

222222
/** ZSTD_getFrameHeader() :
223223
* decode Frame Header, or require larger `srcSize`.
224-
* @return : 0, `fhiPtr` is correctly filled,
224+
* @return : 0, `zfhPtr` is correctly filled,
225225
* >0, `srcSize` is too small, result is expected `srcSize`,
226226
* or an error code, which can be tested using ZSTD_isError() */
227-
size_t ZSTD_getFrameHeader(ZSTD_frameHeader* fhiPtr, const void* src, size_t srcSize)
227+
size_t ZSTD_getFrameHeader(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize)
228228
{
229229
const BYTE* ip = (const BYTE*)src;
230230
if (srcSize < ZSTD_frameHeaderSize_prefix) return ZSTD_frameHeaderSize_prefix;
@@ -233,9 +233,9 @@ size_t ZSTD_getFrameHeader(ZSTD_frameHeader* fhiPtr, const void* src, size_t src
233233
if ((MEM_readLE32(src) & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) {
234234
/* skippable frame */
235235
if (srcSize < ZSTD_skippableHeaderSize) return ZSTD_skippableHeaderSize; /* magic number + skippable frame length */
236-
memset(fhiPtr, 0, sizeof(*fhiPtr));
237-
fhiPtr->frameContentSize = MEM_readLE32((const char *)src + 4);
238-
fhiPtr->windowSize = 0; /* windowSize==0 means a frame is skippable */
236+
memset(zfhPtr, 0, sizeof(*zfhPtr));
237+
zfhPtr->frameContentSize = MEM_readLE32((const char *)src + 4);
238+
zfhPtr->windowSize = 0; /* windowSize==0 means a frame is skippable */
239239
return 0;
240240
}
241241
return ERROR(prefix_unknown);
@@ -282,10 +282,10 @@ size_t ZSTD_getFrameHeader(ZSTD_frameHeader* fhiPtr, const void* src, size_t src
282282
}
283283
if (!windowSize) windowSize = (U32)frameContentSize;
284284
if (windowSize > windowSizeMax) return ERROR(frameParameter_windowTooLarge);
285-
fhiPtr->frameContentSize = frameContentSize;
286-
fhiPtr->windowSize = windowSize;
287-
fhiPtr->dictID = dictID;
288-
fhiPtr->checksumFlag = checksumFlag;
285+
zfhPtr->frameContentSize = frameContentSize;
286+
zfhPtr->windowSize = windowSize;
287+
zfhPtr->dictID = dictID;
288+
zfhPtr->checksumFlag = checksumFlag;
289289
}
290290
return 0;
291291
}

lib/zstd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ ZSTDLIB_API size_t ZSTD_compressEnd(ZSTD_CCtx* cctx, void* dst, size_t dstCapaci
750750
*/
751751

752752
/*===== Buffer-less streaming decompression functions =====*/
753-
ZSTDLIB_API size_t ZSTD_getFrameHeader(ZSTD_frameHeader* fparamsPtr, const void* src, size_t srcSize); /**< doesn't consume input, see details below */
753+
ZSTDLIB_API size_t ZSTD_getFrameHeader(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize); /**< doesn't consume input, see details below */
754754
ZSTDLIB_API size_t ZSTD_decompressBegin(ZSTD_DCtx* dctx);
755755
ZSTDLIB_API size_t ZSTD_decompressBegin_usingDict(ZSTD_DCtx* dctx, const void* dict, size_t dictSize);
756756
ZSTDLIB_API void ZSTD_copyDCtx(ZSTD_DCtx* dctx, const ZSTD_DCtx* preparedDCtx);

0 commit comments

Comments
 (0)