From 5d4568210a81b3b57bea77494a157d31acc7d6a8 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 12 May 2010 12:03:38 +0200 Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom on Linux --- code/ryzom/client/src/seven_zip/7zMain.cpp | 4 ++-- code/ryzom/client/src/seven_zip/LzmaDecode.cpp | 2 +- code/ryzom/client/src/seven_zip/LzmaDecode.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/ryzom/client/src/seven_zip/7zMain.cpp b/code/ryzom/client/src/seven_zip/7zMain.cpp index fa14a8444..00ff961a9 100644 --- a/code/ryzom/client/src/seven_zip/7zMain.cpp +++ b/code/ryzom/client/src/seven_zip/7zMain.cpp @@ -69,7 +69,7 @@ SZ_RESULT SzFileSeekImp(void *object, CFileSize pos) return SZE_FAIL; } -void PrintError(char *sz) +void PrintError(const char *sz) { printf("\nERROR: %s\n", sz); } @@ -179,7 +179,7 @@ int main(int numargs, char *args[]) if (!testCommand) { FILE *outputHandle; - UInt32 processedSize; + size_t processedSize; char *fileName = f->Name; size_t nameLen = strlen(f->Name); for (; nameLen > 0; nameLen--) diff --git a/code/ryzom/client/src/seven_zip/LzmaDecode.cpp b/code/ryzom/client/src/seven_zip/LzmaDecode.cpp index 10f019d57..c45150bad 100644 --- a/code/ryzom/client/src/seven_zip/LzmaDecode.cpp +++ b/code/ryzom/client/src/seven_zip/LzmaDecode.cpp @@ -117,7 +117,7 @@ StopCompilingDueBUG #endif -int LzmaDecodeProperties(CLzmaProperties *propsRes, const unsigned char *propsData, int size) +int LzmaDecodeProperties(CLzmaProperties *propsRes, const unsigned char *propsData, size_t size) { unsigned char prop0; if (size < LZMA_PROPERTIES_SIZE) diff --git a/code/ryzom/client/src/seven_zip/LzmaDecode.h b/code/ryzom/client/src/seven_zip/LzmaDecode.h index 8382fa854..5c7bc3ce1 100644 --- a/code/ryzom/client/src/seven_zip/LzmaDecode.h +++ b/code/ryzom/client/src/seven_zip/LzmaDecode.h @@ -68,7 +68,7 @@ typedef struct _CLzmaProperties #endif }CLzmaProperties; -int LzmaDecodeProperties(CLzmaProperties *propsRes, const unsigned char *propsData, int size); +int LzmaDecodeProperties(CLzmaProperties *propsRes, const unsigned char *propsData, size_t size); #define LzmaGetNumProbs(Properties) (LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((Properties)->lc + (Properties)->lp)))