diff options
Diffstat (limited to 'lib/Net.Compression/vnlib_compress')
-rw-r--r-- | lib/Net.Compression/vnlib_compress/Taskfile.yaml | 4 | ||||
-rw-r--r-- | lib/Net.Compression/vnlib_compress/compression.c | 43 | ||||
-rw-r--r-- | lib/Net.Compression/vnlib_compress/compression.h | 6 | ||||
-rw-r--r-- | lib/Net.Compression/vnlib_compress/util.h | 5 |
4 files changed, 17 insertions, 41 deletions
diff --git a/lib/Net.Compression/vnlib_compress/Taskfile.yaml b/lib/Net.Compression/vnlib_compress/Taskfile.yaml index 017c9d8..fff756d 100644 --- a/lib/Net.Compression/vnlib_compress/Taskfile.yaml +++ b/lib/Net.Compression/vnlib_compress/Taskfile.yaml @@ -78,8 +78,8 @@ tasks: - cmd: powershell -Command "cp ../LICENSE build/Release/license.txt" #create static-build archives - - cd build/Debug && tar -czf ../../bin/win-x64-debug.tgz {{.TAR_FILES}} - - cd build/Release && tar -czf ../../bin/win-x64-release.tgz {{.TAR_FILES}} + - cd build/Debug && tar -czf ../../bin/msvc-x64-debug-{{.PROJECT_NAME}}.tgz {{.TAR_FILES}} + - cd build/Release && tar -czf ../../bin/msvc-x64-release-{{.PROJECT_NAME}}.tgz {{.TAR_FILES}} #Remove the output dirs on clean clean: diff --git a/lib/Net.Compression/vnlib_compress/compression.c b/lib/Net.Compression/vnlib_compress/compression.c index bf3ffbe..0cba998 100644 --- a/lib/Net.Compression/vnlib_compress/compression.c +++ b/lib/Net.Compression/vnlib_compress/compression.c @@ -74,31 +74,19 @@ VNLIB_COMPRESS_EXPORT CompressorType VNLIB_COMPRESS_CC GetSupportedCompressors(v VNLIB_COMPRESS_EXPORT CompressorType VNLIB_COMPRESS_CC GetCompressorType(_In_ const void* compressor) { - if (!compressor) - { - return ERR_INVALID_PTR; - } - + CHECK_NULL_PTR(compressor) return ((CompressorState*)compressor)->type; } VNLIB_COMPRESS_EXPORT CompressionLevel VNLIB_COMPRESS_CC GetCompressorLevel(_In_ const void* compressor) { - if (!compressor) - { - return ERR_INVALID_PTR; - } - + CHECK_NULL_PTR(compressor) return ((CompressorState*)compressor)->level; } VNLIB_COMPRESS_EXPORT int64_t VNLIB_COMPRESS_CC GetCompressorBlockSize(_In_ const void* compressor) { - if (!compressor) - { - return ERR_INVALID_PTR; - } - + CHECK_NULL_PTR(compressor) return (int64_t)((CompressorState*)compressor)->blockSize; } @@ -194,15 +182,12 @@ VNLIB_COMPRESS_EXPORT void* VNLIB_COMPRESS_CC AllocateCompressor(CompressorType } } -VNLIB_COMPRESS_EXPORT int VNLIB_COMPRESS_CC FreeCompressor(_In_ void* compressor) +VNLIB_COMPRESS_EXPORT int VNLIB_COMPRESS_CC FreeCompressor(void* compressor) { CompressorState* comp; int errorCode; - if (!compressor) - { - return ERR_INVALID_PTR; - } + CHECK_NULL_PTR(compressor) comp = (CompressorState*)compressor; errorCode = TRUE; @@ -252,10 +237,7 @@ VNLIB_COMPRESS_EXPORT int64_t VNLIB_COMPRESS_CC GetCompressedSize(_In_ const voi CompressorState* comp; int64_t result; - if (!compressor) - { - return ERR_INVALID_PTR; - } + CHECK_NULL_PTR(compressor) if (inputLength > INT64_MAX) { @@ -313,15 +295,8 @@ VNLIB_COMPRESS_EXPORT int VNLIB_COMPRESS_CC CompressBlock(_In_ const void* compr * Validate input arguments */ - if (!comp) - { - return ERR_INVALID_PTR; - } - - if (!operation) - { - return ERR_INVALID_PTR; - } + CHECK_NULL_PTR(comp) + CHECK_NULL_PTR(operation) /* * Validate buffers, if the buffer length is greate than 0 @@ -371,4 +346,4 @@ VNLIB_COMPRESS_EXPORT int VNLIB_COMPRESS_CC CompressBlock(_In_ const void* compr } return result; -}
\ No newline at end of file +} diff --git a/lib/Net.Compression/vnlib_compress/compression.h b/lib/Net.Compression/vnlib_compress/compression.h index 0524a01..a6a6104 100644 --- a/lib/Net.Compression/vnlib_compress/compression.h +++ b/lib/Net.Compression/vnlib_compress/compression.h @@ -70,6 +70,10 @@ #endif // !VNLIB_EXPORTING #endif // !VNLIB_EXPORT +#ifndef _In_ + #define _In_ +#endif + /* * ERRORS AND CONSTANTS */ @@ -234,7 +238,7 @@ VNLIB_COMPRESS_EXPORT void* VNLIB_COMPRESS_CC AllocateCompressor(CompressorType * @param compressor A pointer to the desired compressor instance to free. * @return The underlying compressor's native return code. */ -VNLIB_COMPRESS_EXPORT int VNLIB_COMPRESS_CC FreeCompressor(_In_ void* compressor); +VNLIB_COMPRESS_EXPORT int VNLIB_COMPRESS_CC FreeCompressor(void* compressor); /* * Computes the maximum compressed size of the specified input data. This is not supported diff --git a/lib/Net.Compression/vnlib_compress/util.h b/lib/Net.Compression/vnlib_compress/util.h index 34659d8..c29de4b 100644 --- a/lib/Net.Compression/vnlib_compress/util.h +++ b/lib/Net.Compression/vnlib_compress/util.h @@ -64,10 +64,6 @@ #define FALSE 0 #endif // !FALSE -#ifndef _In_ - #define _In_ -#endif - /* * Add debug runtime assertions */ @@ -77,6 +73,7 @@ #define assert(x) {} #endif +#define CHECK_NULL_PTR(ptr) if(!ptr) return ERR_INVALID_PTR; #ifdef NATIVE_HEAP_API /* Defined in the NativeHeapApi */ /* |