thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GOB: Remove strncpy0()

Browse source 
Replacing it (and some strncpy + manual terminating) with
Common::strlcpy()

svn-id: r53490
This commit is contained in:
Sven Hesse 2010-10-15 13:54:23 +00:00
parent 04973e85be
commit 5c48c3fd2b
15 changed files with 47 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/gob/inter_v6.cpp
View file

@ -24,6 +24,7 @@
*/
#include "common/endian.h"
#include "common/str.h"
#include "common/file.h"
#include "graphics/dither.h"
@ -104,7 +105,7 @@ void Inter_v6::o6_playVmdOrMusic() {
bool close;
_vm->_game->_script->evalExpr(0);
strncpy0(fileName, _vm->_game->_script->getResultStr(), 127);
Common::strlcpy(fileName, _vm->_game->_script->getResultStr(), 128);
VideoPlayer::Properties props;
@ -187,7 +188,7 @@ void Inter_v6::o6_openItk() {
char fileName[32];
_vm->_game->_script->evalExpr(0);
strncpy0(fileName, _vm->_game->_script->getResultStr(), 27);
Common::strlcpy(fileName, _vm->_game->_script->getResultStr(), 28);
if (!strchr(fileName, '.'))
strcat(fileName, ".ITK");