[Scummvm-cvs-logs] SF.net SVN: scummvm:[38249] scummvm/trunk/engines/sci/engine
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sun Feb 15 15:59:03 CET 2009
Revision: 38249
http://scummvm.svn.sourceforge.net/scummvm/?rev=38249&view=rev
Author: lordhoto
Date: 2009-02-15 14:59:03 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
Fixed some warnings.
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/grammar.cpp
scummvm/trunk/engines/sci/engine/kernel.cpp
scummvm/trunk/engines/sci/engine/kfile.cpp
Modified: scummvm/trunk/engines/sci/engine/grammar.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/grammar.cpp 2009-02-15 14:52:52 UTC (rev 38248)
+++ scummvm/trunk/engines/sci/engine/grammar.cpp 2009-02-15 14:59:03 UTC (rev 38249)
@@ -56,7 +56,7 @@
sciprintf("e");
for(i = 0; i < rule->length; i++) {
- int token = rule->data[i];
+ uint token = rule->data[i];
if (token == TOKEN_OPAREN) {
@@ -529,9 +529,9 @@
_vbpt_write_subexpression(parse_tree_node_t *nodes, int *pos,
parse_rule_t *rule, int rulepos, int writepos)
{
- int token;
+ uint token;
while ((token = ((rulepos < rule->length)? rule->data[rulepos++] : TOKEN_CPAREN)) != TOKEN_CPAREN) {
- int nexttoken = (rulepos < rule->length)? rule->data[rulepos] : TOKEN_CPAREN;
+ uint nexttoken = (rulepos < rule->length)? rule->data[rulepos] : TOKEN_CPAREN;
if (token == TOKEN_OPAREN) {
int wpold;
int writepos2 = _vbpt_pareno(nodes, pos, wpold = writepos);
Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp 2009-02-15 14:52:52 UTC (rev 38248)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp 2009-02-15 14:59:03 UTC (rev 38249)
@@ -732,7 +732,7 @@
reg_t
kNOP(state_t *s, int funct_nr, int argc, reg_t *argv)
{
- char *problem = (char*)(s->kfunct_table[funct_nr].orig_name ?
+ const char *problem = (const char*)(s->kfunct_table[funct_nr].orig_name ?
"unmapped" : "NOP");
SCIkwarn(SCIkWARNING, "Warning: Kernel function 0x%02x invoked: %s", funct_nr, problem);
Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp 2009-02-15 14:52:52 UTC (rev 38248)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp 2009-02-15 14:59:03 UTC (rev 38249)
@@ -919,7 +919,7 @@
if ((idfile = sci_fopen(game_id_file_name, "w"))) {
- fprintf(idfile, game_description);
+ fprintf(idfile, "%s", game_description);
fclose(idfile);
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list