Skip to content

D
deprecated-irrlicht-mac
Commit 520f1f27 authored by cutealien's avatar cutealien
Browse files
Options

Use %u instead of %d for unsigned integers in printf in a few places. 

Found by VS code analysis.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5109 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 4919ac19
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 73 deletions
source/Irrlicht/CAnimatedMeshHalfLife.cpp
View file @ 520f1f27
...@@ -1166,7 +1166,7 @@ bool CAnimatedMeshHalfLife::postLoadModel( const io::path &filename ) ...@@ -1166,7 +1166,7 @@ bool CAnimatedMeshHalfLife::postLoadModel( const io::path &filename )
c8 seq[8]; c8 seq[8];
for (u32 i = 1; i < Header->numseqgroups; i++) for (u32 i = 1; i < Header->numseqgroups; i++)
{ {
snprintf_irr( seq, 8, "%02d.mdl", i ); snprintf_irr( seq, 8, "%02u.mdl", i );
submodel = path + texname + seq; submodel = path + texname + seq;
AnimationHeader[i] = loadModel(0, submodel); AnimationHeader[i] = loadModel(0, submodel);
...@@ -1190,11 +1190,11 @@ void CAnimatedMeshHalfLife::dumpModelInfo(u32 level) const ...@@ -1190,11 +1190,11 @@ void CAnimatedMeshHalfLife::dumpModelInfo(u32 level) const
if (level == 0) if (level == 0)
{ {
printf ( printf (
"Bones: %d\n" "Bones: %u\n"
"Bone Controllers: %d\n" "Bone Controllers: %u\n"
"Hit Boxes: %d\n" "Hit Boxes: %u\n"
"Sequences: %d\n" "Sequences: %u\n"
"Sequence Groups: %d\n", "Sequence Groups: %u\n",
hdr->numbones, hdr->numbones,
hdr->numbonecontrollers, hdr->numbonecontrollers,
hdr->numhitboxes, hdr->numhitboxes,
...@@ -1202,10 +1202,10 @@ void CAnimatedMeshHalfLife::dumpModelInfo(u32 level) const ...@@ -1202,10 +1202,10 @@ void CAnimatedMeshHalfLife::dumpModelInfo(u32 level) const
hdr->numseqgroups hdr->numseqgroups
); );
printf ( printf (
"Textures: %d\n" "Textures: %u\n"
"Skin Families: %d\n" "Skin Families: %u\n"
"Bodyparts: %d\n" "Bodyparts: %u\n"
"Attachments: %d\n" "Attachments: %u\n"
"Transitions: %d\n", "Transitions: %d\n",
hdr->numtextures, hdr->numtextures,
hdr->numskinfamilies, hdr->numskinfamilies,
...@@ -1228,91 +1228,91 @@ void CAnimatedMeshHalfLife::dumpModelInfo(u32 level) const ...@@ -1228,91 +1228,91 @@ void CAnimatedMeshHalfLife::dumpModelInfo(u32 level) const
printf("flags: %d\n\n", hdr->flags); printf("flags: %d\n\n", hdr->flags);
printf("numbones: %d\n", hdr->numbones); printf("numbones: %u\n", hdr->numbones);
for (i = 0; i < hdr->numbones; i++) for (i = 0; i < hdr->numbones; i++)
{ {
const SHalflifeBone *bone = (const SHalflifeBone *) (phdr + hdr->boneindex); const SHalflifeBone *bone = (const SHalflifeBone *) (phdr + hdr->boneindex);
printf("bone %d.name: \"%s\"\n", i + 1, bone[i].name); printf("bone %u.name: \"%s\"\n", i + 1, bone[i].name);
printf("bone %d.parent: %d\n", i + 1, bone[i].parent); printf("bone %u.parent: %d\n", i + 1, bone[i].parent);
printf("bone %d.flags: %d\n", i + 1, bone[i].flags); printf("bone %u.flags: %d\n", i + 1, bone[i].flags);
printf("bone %d.bonecontroller: %d %d %d %d %d %d\n", i + 1, bone[i].bonecontroller[0], bone[i].bonecontroller[1], bone[i].bonecontroller[2], bone[i].bonecontroller[3], bone[i].bonecontroller[4], bone[i].bonecontroller[5]); printf("bone %u.bonecontroller: %d %d %d %d %d %d\n", i + 1, bone[i].bonecontroller[0], bone[i].bonecontroller[1], bone[i].bonecontroller[2], bone[i].bonecontroller[3], bone[i].bonecontroller[4], bone[i].bonecontroller[5]);
printf("bone %d.value: %f %f %f %f %f %f\n", i + 1, bone[i].value[0], bone[i].value[1], bone[i].value[2], bone[i].value[3], bone[i].value[4], bone[i].value[5]); printf("bone %u.value: %f %f %f %f %f %f\n", i + 1, bone[i].value[0], bone[i].value[1], bone[i].value[2], bone[i].value[3], bone[i].value[4], bone[i].value[5]);
printf("bone %d.scale: %f %f %f %f %f %f\n", i + 1, bone[i].scale[0], bone[i].scale[1], bone[i].scale[2], bone[i].scale[3], bone[i].scale[4], bone[i].scale[5]); printf("bone %u.scale: %f %f %f %f %f %f\n", i + 1, bone[i].scale[0], bone[i].scale[1], bone[i].scale[2], bone[i].scale[3], bone[i].scale[4], bone[i].scale[5]);
} }
printf("\nnumbonecontrollers: %d\n", hdr->numbonecontrollers); printf("\nnumbonecontrollers: %u\n", hdr->numbonecontrollers);
const SHalflifeBoneController *bonecontrollers = (const SHalflifeBoneController *) (phdr + hdr->bonecontrollerindex); const SHalflifeBoneController *bonecontrollers = (const SHalflifeBoneController *) (phdr + hdr->bonecontrollerindex);
for (i = 0; i < hdr->numbonecontrollers; i++) for (i = 0; i < hdr->numbonecontrollers; i++)
{ {
printf("bonecontroller %d.bone: %d\n", i + 1, bonecontrollers[i].bone); printf("bonecontroller %u.bone: %d\n", i + 1, bonecontrollers[i].bone);
printf("bonecontroller %d.type: %d\n", i + 1, bonecontrollers[i].type); printf("bonecontroller %u.type: %d\n", i + 1, bonecontrollers[i].type);
printf("bonecontroller %d.start: %f\n", i + 1, bonecontrollers[i].start); printf("bonecontroller %u.start: %f\n", i + 1, bonecontrollers[i].start);
printf("bonecontroller %d.end: %f\n", i + 1, bonecontrollers[i].end); printf("bonecontroller %u.end: %f\n", i + 1, bonecontrollers[i].end);
printf("bonecontroller %d.rest: %d\n", i + 1, bonecontrollers[i].rest); printf("bonecontroller %u.rest: %d\n", i + 1, bonecontrollers[i].rest);
printf("bonecontroller %d.index: %d\n", i + 1, bonecontrollers[i].index); printf("bonecontroller %u.index: %d\n", i + 1, bonecontrollers[i].index);
} }
printf("\nnumhitboxes: %d\n", hdr->numhitboxes); printf("\nnumhitboxes: %u\n", hdr->numhitboxes);
const SHalflifeBBox *box = (const SHalflifeBBox *) (phdr + hdr->hitboxindex); const SHalflifeBBox *box = (const SHalflifeBBox *) (phdr + hdr->hitboxindex);
for (i = 0; i < hdr->numhitboxes; i++) for (i = 0; i < hdr->numhitboxes; i++)
{ {
printf("hitbox %d.bone: %d\n", i + 1, box[i].bone); printf("hitbox %u.bone: %d\n", i + 1, box[i].bone);
printf("hitbox %d.group: %d\n", i + 1, box[i].group); printf("hitbox %u.group: %d\n", i + 1, box[i].group);
printf("hitbox %d.bbmin: %f %f %f\n", i + 1, box[i].bbmin[0], box[i].bbmin[1], box[i].bbmin[2]); printf("hitbox %u.bbmin: %f %f %f\n", i + 1, box[i].bbmin[0], box[i].bbmin[1], box[i].bbmin[2]);
printf("hitbox %d.bbmax: %f %f %f\n", i + 1, box[i].bbmax[0], box[i].bbmax[1], box[i].bbmax[2]); printf("hitbox %u.bbmax: %f %f %f\n", i + 1, box[i].bbmax[0], box[i].bbmax[1], box[i].bbmax[2]);
} }
printf("\nnumseq: %d\n", hdr->numseq); printf("\nnumseq: %u\n", hdr->numseq);
const SHalflifeSequence *seq = (const SHalflifeSequence *) (phdr + hdr->seqindex); const SHalflifeSequence *seq = (const SHalflifeSequence *) (phdr + hdr->seqindex);
for (i = 0; i < hdr->numseq; i++) for (i = 0; i < hdr->numseq; i++)
{ {
printf("seqdesc %d.label: \"%s\"\n", i + 1, seq[i].label); printf("seqdesc %u.label: \"%s\"\n", i + 1, seq[i].label);
printf("seqdesc %d.fps: %f\n", i + 1, seq[i].fps); printf("seqdesc %u.fps: %f\n", i + 1, seq[i].fps);
printf("seqdesc %d.flags: %d\n", i + 1, seq[i].flags); printf("seqdesc %u.flags: %d\n", i + 1, seq[i].flags);
printf("<...>\n"); printf("<...>\n");
} }
printf("\nnumseqgroups: %d\n", hdr->numseqgroups); printf("\nnumseqgroups: %u\n", hdr->numseqgroups);
for (i = 0; i < hdr->numseqgroups; i++) for (i = 0; i < hdr->numseqgroups; i++)
{ {
const SHalflifeSequenceGroup *group = (const SHalflifeSequenceGroup *) (phdr + hdr->seqgroupindex); const SHalflifeSequenceGroup *group = (const SHalflifeSequenceGroup *) (phdr + hdr->seqgroupindex);
printf("\nseqgroup %d.label: \"%s\"\n", i + 1, group[i].label); printf("\nseqgroup %u.label: \"%s\"\n", i + 1, group[i].label);
printf("\nseqgroup %d.namel: \"%s\"\n", i + 1, group[i].name); printf("\nseqgroup %u.namel: \"%s\"\n", i + 1, group[i].name);
printf("\nseqgroup %d.data: %d\n", i + 1, group[i].data); printf("\nseqgroup %u.data: %d\n", i + 1, group[i].data);
} }
printf("\nnumskinref: %d\n", hdr->numskinref); printf("\nnumskinref: %u\n", hdr->numskinref);
printf("numskinfamilies: %d\n", hdr->numskinfamilies); printf("numskinfamilies: %u\n", hdr->numskinfamilies);
printf("\nnumbodyparts: %d\n", hdr->numbodyparts); printf("\nnumbodyparts: %u\n", hdr->numbodyparts);
const SHalflifeBody *pbodyparts = (const SHalflifeBody*) ((const u8*) hdr + hdr->bodypartindex); const SHalflifeBody *pbodyparts = (const SHalflifeBody*) ((const u8*) hdr + hdr->bodypartindex);
for (i = 0; i < hdr->numbodyparts; i++) for (i = 0; i < hdr->numbodyparts; i++)
{ {
printf("bodypart %d.name: \"%s\"\n", i + 1, pbodyparts[i].name); printf("bodypart %u.name: \"%s\"\n", i + 1, pbodyparts[i].name);
printf("bodypart %d.nummodels: %d\n", i + 1, pbodyparts[i].nummodels); printf("bodypart %u.nummodels: %u\n", i + 1, pbodyparts[i].nummodels);
printf("bodypart %d.base: %d\n", i + 1, pbodyparts[i].base); printf("bodypart %u.base: %u\n", i + 1, pbodyparts[i].base);
printf("bodypart %d.modelindex: %d\n", i + 1, pbodyparts[i].modelindex); printf("bodypart %d.modelindex: %u\n", i + 1, pbodyparts[i].modelindex);
} }
printf("\nnumattachments: %d\n", hdr->numattachments); printf("\nnumattachments: %u\n", hdr->numattachments);
for (i = 0; i < hdr->numattachments; i++) for (i = 0; i < hdr->numattachments; i++)
{ {
const SHalflifeAttachment *attach = (const SHalflifeAttachment *) ((const u8*) hdr + hdr->attachmentindex); const SHalflifeAttachment *attach = (const SHalflifeAttachment *) ((const u8*) hdr + hdr->attachmentindex);
printf("attachment %d.name: \"%s\"\n", i + 1, attach[i].name); printf("attachment %u.name: \"%s\"\n", i + 1, attach[i].name);
} }
hdr = TextureHeader; hdr = TextureHeader;
printf("\nnumtextures: %d\n", hdr->numtextures); printf("\nnumtextures: %u\n", hdr->numtextures);
printf("textureindex: %d\n", hdr->textureindex); printf("textureindex: %u\n", hdr->textureindex);
printf("texturedataindex: %d\n", hdr->texturedataindex); printf("texturedataindex: %u\n", hdr->texturedataindex);
const SHalflifeTexture *ptextures = (const SHalflifeTexture *) ((const u8*) hdr + hdr->textureindex); const SHalflifeTexture *ptextures = (const SHalflifeTexture *) ((const u8*) hdr + hdr->textureindex);
for (i = 0; i < hdr->numtextures; i++) for (i = 0; i < hdr->numtextures; i++)
{ {
printf("texture %d.name: \"%s\"\n", i + 1, ptextures[i].name); printf("texture %u.name: \"%s\"\n", i + 1, ptextures[i].name);
printf("texture %d.flags: %d\n", i + 1, ptextures[i].flags); printf("texture %u.flags: %d\n", i + 1, ptextures[i].flags);
printf("texture %d.width: %d\n", i + 1, ptextures[i].width); printf("texture %u.width: %d\n", i + 1, ptextures[i].width);
printf("texture %d.height: %d\n", i + 1, ptextures[i].height); printf("texture %u.height: %d\n", i + 1, ptextures[i].height);
printf("texture %d.index: %d\n", i + 1, ptextures[i].index); printf("texture %u.index: %d\n", i + 1, ptextures[i].index);
} }
} }
......
source/Irrlicht/CGeometryCreator.cpp
View file @ 520f1f27
...@@ -372,7 +372,7 @@ IMesh* CGeometryCreator::createTerrainMesh(video::IImage* texture, ...@@ -372,7 +372,7 @@ IMesh* CGeometryCreator::createTerrainMesh(video::IImage* texture,
if (buffer->Material.getTexture(0)) if (buffer->Material.getTexture(0))
{ {
c8 tmp[255]; c8 tmp[255];
sprintf(tmp, "Generated terrain texture (%dx%d): %s", sprintf(tmp, "Generated terrain texture (%ux%u): %s",
buffer->Material.getTexture(0)->getSize().Width, buffer->Material.getTexture(0)->getSize().Width,
buffer->Material.getTexture(0)->getSize().Height, buffer->Material.getTexture(0)->getSize().Height,
textureName); textureName);
......
source/Irrlicht/CImageWriterPPM.cpp
View file @ 520f1f27
...@@ -54,7 +54,7 @@ bool CImageWriterPPM::writeImage(io::IWriteFile *file, IImage *image, u32 param) ...@@ -54,7 +54,7 @@ bool CImageWriterPPM::writeImage(io::IWriteFile *file, IImage *image, u32 param)
if (file->write(cache, size) != size) if (file->write(cache, size) != size)
return false; return false;
size = snprintf_irr(cache, 70, "%d %d\n", imageSize.Width, imageSize.Height); size = snprintf_irr(cache, 70, "%u %u\n", imageSize.Width, imageSize.Height);
if (file->write(cache, size) != size) if (file->write(cache, size) != size)
return false; return false;
......
source/Irrlicht/CIrrDeviceWin32.cpp
View file @ 520f1f27
...@@ -1679,7 +1679,7 @@ void CIrrDeviceWin32::getWindowsVersion(core::stringc& out) ...@@ -1679,7 +1679,7 @@ void CIrrDeviceWin32::getWindowsVersion(core::stringc& out)
if (osvi.dwMajorVersion <= 4 ) if (osvi.dwMajorVersion <= 4 )
{ {
sprintf(tmp, "version %ld.%ld %s (Build %ld)", sprintf(tmp, "version %lu.%lu %s (Build %lu)",
osvi.dwMajorVersion, osvi.dwMajorVersion,
osvi.dwMinorVersion, osvi.dwMinorVersion,
irr::core::stringc(osvi.szCSDVersion).c_str(), irr::core::stringc(osvi.szCSDVersion).c_str(),
...@@ -1687,7 +1687,7 @@ void CIrrDeviceWin32::getWindowsVersion(core::stringc& out) ...@@ -1687,7 +1687,7 @@ void CIrrDeviceWin32::getWindowsVersion(core::stringc& out)
} }
else else
{ {
sprintf(tmp, "%s (Build %ld)", irr::core::stringc(osvi.szCSDVersion).c_str(), sprintf(tmp, "%s (Build %lu)", irr::core::stringc(osvi.szCSDVersion).c_str(),
osvi.dwBuildNumber & 0xFFFF); osvi.dwBuildNumber & 0xFFFF);
} }
......
source/Irrlicht/CQ3LevelMesh.cpp
View file @ 520f1f27
...@@ -1083,7 +1083,7 @@ void CQ3LevelMesh::constructMesh() ...@@ -1083,7 +1083,7 @@ void CQ3LevelMesh::constructMesh()
LoadParam.endTime = os::Timer::getRealTime(); LoadParam.endTime = os::Timer::getRealTime();
snprintf_irr( buf, sizeof ( buf ), snprintf_irr( buf, sizeof ( buf ),
"quake3::constructMesh needed %04d ms to create %d faces, %d vertices,%d mesh vertices", "quake3::constructMesh needed %04u ms to create %d faces, %d vertices,%d mesh vertices",
LoadParam.endTime - LoadParam.startTime, LoadParam.endTime - LoadParam.startTime,
NumFaces, NumFaces,
NumVertices, NumVertices,
...@@ -1419,7 +1419,7 @@ void CQ3LevelMesh::createCurvedSurface_bezier(SMeshBufferLightMap* meshBuffer, ...@@ -1419,7 +1419,7 @@ void CQ3LevelMesh::createCurvedSurface_bezier(SMeshBufferLightMap* meshBuffer,
LoadParam.endTime = os::Timer::getRealTime(); LoadParam.endTime = os::Timer::getRealTime();
snprintf_irr( buf, sizeof ( buf ), snprintf_irr( buf, sizeof ( buf ),
"quake3::createCurvedSurface_bezier needed %04d ms to create bezier patch.(%dx%d)", "quake3::createCurvedSurface_bezier needed %04u ms to create bezier patch.(%ux%u)",
LoadParam.endTime - LoadParam.startTime, LoadParam.endTime - LoadParam.startTime,
biquadWidth, biquadWidth,
biquadHeight biquadHeight
...@@ -1804,7 +1804,7 @@ void CQ3LevelMesh::cleanMesh(SMesh *m, const bool texture0important) ...@@ -1804,7 +1804,7 @@ void CQ3LevelMesh::cleanMesh(SMesh *m, const bool texture0important)
if ( LoadParam.verbose > 1 ) if ( LoadParam.verbose > 1 )
{ {
snprintf_irr( buf, sizeof ( buf ), snprintf_irr( buf, sizeof ( buf ),
"quake3::cleanMeshes start for %d meshes", "quake3::cleanMeshes start for %u meshes",
m->MeshBuffers.size() m->MeshBuffers.size()
); );
os::Printer::log(buf, ELL_INFORMATION); os::Printer::log(buf, ELL_INFORMATION);
...@@ -1863,7 +1863,7 @@ void CQ3LevelMesh::cleanMesh(SMesh *m, const bool texture0important) ...@@ -1863,7 +1863,7 @@ void CQ3LevelMesh::cleanMesh(SMesh *m, const bool texture0important)
{ {
LoadParam.endTime = os::Timer::getRealTime(); LoadParam.endTime = os::Timer::getRealTime();
snprintf_irr( buf, sizeof ( buf ), snprintf_irr( buf, sizeof ( buf ),
"quake3::cleanMeshes needed %04d ms to clean %d of %d meshes", "quake3::cleanMeshes needed %04u ms to clean %u of %u meshes",
LoadParam.endTime - LoadParam.startTime, LoadParam.endTime - LoadParam.startTime,
remove, remove,
run run
...@@ -1923,7 +1923,7 @@ void CQ3LevelMesh::calcBoundingBoxes() ...@@ -1923,7 +1923,7 @@ void CQ3LevelMesh::calcBoundingBoxes()
LoadParam.endTime = os::Timer::getRealTime(); LoadParam.endTime = os::Timer::getRealTime();
snprintf_irr( buf, sizeof ( buf ), snprintf_irr( buf, sizeof ( buf ),
"quake3::calcBoundingBoxes needed %04d ms to create %d textures and %d lightmaps", "quake3::calcBoundingBoxes needed %04u ms to create %d textures and %d lightmaps",
LoadParam.endTime - LoadParam.startTime, LoadParam.endTime - LoadParam.startTime,
NumTextures, NumTextures,
NumLightMaps NumLightMaps
...@@ -2047,7 +2047,7 @@ void CQ3LevelMesh::loadTextures() ...@@ -2047,7 +2047,7 @@ void CQ3LevelMesh::loadTextures()
LoadParam.endTime = os::Timer::getRealTime(); LoadParam.endTime = os::Timer::getRealTime();
snprintf_irr( buf, sizeof ( buf ), snprintf_irr( buf, sizeof ( buf ),
"quake3::loadTextures needed %04d ms to create %d textures and %d lightmaps", "quake3::loadTextures needed %04u ms to create %d textures and %d lightmaps",
LoadParam.endTime - LoadParam.startTime, LoadParam.endTime - LoadParam.startTime,
NumTextures, NumTextures,
NumLightMaps NumLightMaps
......
source/Irrlicht/CZipReader.cpp
View file @ 520f1f27
...@@ -620,7 +620,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index) ...@@ -620,7 +620,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
c8* pBuf = new c8[ uncompressedSize ]; c8* pBuf = new c8[ uncompressedSize ];
if (!pBuf) if (!pBuf)
{ {
swprintf_irr ( buf, 64, L"Not enough memory for decompressing %s", Files[index].FullName.c_str() ); swprintf_irr ( buf, 64, L"Not enough memory for decompressing %s", core::stringw(Files[index].FullName).c_str() );
os::Printer::log( buf, ELL_ERROR); os::Printer::log( buf, ELL_ERROR);
if (decrypted) if (decrypted)
decrypted->drop(); decrypted->drop();
...@@ -633,7 +633,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index) ...@@ -633,7 +633,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
pcData = new u8[decryptedSize]; pcData = new u8[decryptedSize];
if (!pcData) if (!pcData)
{ {
swprintf_irr ( buf, 64, L"Not enough memory for decompressing %s", Files[index].FullName.c_str() ); swprintf_irr ( buf, 64, L"Not enough memory for decompressing %s", core::stringw(Files[index].FullName).c_str() );
os::Printer::log( buf, ELL_ERROR); os::Printer::log( buf, ELL_ERROR);
delete [] pBuf; delete [] pBuf;
return 0; return 0;
...@@ -674,7 +674,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index) ...@@ -674,7 +674,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
if (err != Z_OK) if (err != Z_OK)
{ {
swprintf_irr ( buf, 64, L"Error decompressing %s", Files[index].FullName.c_str() ); swprintf_irr ( buf, 64, L"Error decompressing %s", core::stringw(Files[index].FullName).c_str() );
os::Printer::log( buf, ELL_ERROR); os::Printer::log( buf, ELL_ERROR);
delete [] pBuf; delete [] pBuf;
return 0; return 0;
...@@ -694,7 +694,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index) ...@@ -694,7 +694,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
c8* pBuf = new c8[ uncompressedSize ]; c8* pBuf = new c8[ uncompressedSize ];
if (!pBuf) if (!pBuf)
{ {
swprintf_irr ( buf, 64, L"Not enough memory for decompressing %s", Files[index].FullName.c_str() ); swprintf_irr ( buf, 64, L"Not enough memory for decompressing %s", core::stringw(Files[index].FullName).c_str() );
os::Printer::log( buf, ELL_ERROR); os::Printer::log( buf, ELL_ERROR);
if (decrypted) if (decrypted)
decrypted->drop(); decrypted->drop();
...@@ -707,7 +707,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index) ...@@ -707,7 +707,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
pcData = new u8[decryptedSize]; pcData = new u8[decryptedSize];
if (!pcData) if (!pcData)
{ {
swprintf_irr ( buf, 64, L"Not enough memory for decompressing %s", Files[index].FullName.c_str() ); swprintf_irr ( buf, 64, L"Not enough memory for decompressing %s", core::stringw(Files[index].FullName).c_str() );
os::Printer::log( buf, ELL_ERROR); os::Printer::log( buf, ELL_ERROR);
delete [] pBuf; delete [] pBuf;
return 0; return 0;
...@@ -745,7 +745,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index) ...@@ -745,7 +745,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
if (err != BZ_OK) if (err != BZ_OK)
{ {
swprintf_irr ( buf, 64, L"Error decompressing %s", Files[index].FullName.c_str() ); swprintf_irr ( buf, 64, L"Error decompressing %s", core::stringw(Files[index].FullName).c_str() );
os::Printer::log( buf, ELL_ERROR); os::Printer::log( buf, ELL_ERROR);
delete [] pBuf; delete [] pBuf;
return 0; return 0;
...@@ -766,7 +766,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index) ...@@ -766,7 +766,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
c8* pBuf = new c8[ uncompressedSize ]; c8* pBuf = new c8[ uncompressedSize ];
if (!pBuf) if (!pBuf)
{ {
swprintf_irr ( buf, 64, L"Not enough memory for decompressing %s", Files[index].FullName.c_str() ); swprintf_irr ( buf, 64, L"Not enough memory for decompressing %s", core::stringw(Files[index].FullName).c_str() );
os::Printer::log( buf, ELL_ERROR); os::Printer::log( buf, ELL_ERROR);
if (decrypted) if (decrypted)
decrypted->drop(); decrypted->drop();
...@@ -779,7 +779,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index) ...@@ -779,7 +779,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
pcData = new u8[decryptedSize]; pcData = new u8[decryptedSize];
if (!pcData) if (!pcData)
{ {
swprintf_irr ( buf, 64, L"Not enough memory for decompressing %s", Files[index].FullName.c_str() ); swprintf_irr ( buf, 64, L"Not enough memory for decompressing %s", core::stringw(Files[index].FullName).c_str() );
os::Printer::log( buf, ELL_ERROR); os::Printer::log( buf, ELL_ERROR);
delete [] pBuf; delete [] pBuf;
return 0; return 0;
...@@ -826,7 +826,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index) ...@@ -826,7 +826,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
os::Printer::log("Decryption support not enabled. File cannot be read.", ELL_ERROR); os::Printer::log("Decryption support not enabled. File cannot be read.", ELL_ERROR);
return 0; return 0;
default: default:
swprintf_irr ( buf, 64, L"file has unsupported compression method. %s", Files[index].FullName.c_str() ); swprintf_irr ( buf, 64, L"file has unsupported compression method. %s", core::stringw(Files[index].FullName).c_str() );
os::Printer::log( buf, ELL_ERROR); os::Printer::log( buf, ELL_ERROR);
return 0; return 0;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment