1.1 --- a/sourcehook/generate/shworker/shworker.cpp Sun May 14 18:29:35 2006 +0000
1.2 +++ b/sourcehook/generate/shworker/shworker.cpp Sun May 14 19:07:01 2006 +0000
1.3 @@ -444,14 +444,14 @@
1.4 for (int i = 0; i < argc; ++i)
1.5 {
1.6 varname[1] = 'a' + i;
1.7 - itoa(argv[i], value, 10);
1.8 + sprintf(value, "%d", argv[i]);
1.9 DoReplace(buf, varname, value);
1.10 }
1.11
1.12 for (varmap::const_iterator iter = vars.begin(); iter != vars.end(); ++iter)
1.13 {
1.14 varname[1] = '0' + iter->first;
1.15 - itoa(iter->second, value, 10);
1.16 + sprintf(value, "%d", iter->second);
1.17 DoReplace(buf, varname, value);
1.18 }
1.19 }
1.20 @@ -608,8 +608,8 @@
1.21 // Add separator if required
1.22 if (sepbegin != string::npos && i != expr_max)
1.23 {
1.24 - do_input(argc, argv, outfile,
1.25 - string(sect.begin() + sepbegin, sect.begin() + sepend), curvars);
1.26 + string tmp(sect.begin() + sepbegin, sect.begin() + sepend);
1.27 + do_input(argc, argv, outfile, tmp, curvars);
1.28 }
1.29 }
1.30 // Remove the var!
1.31 @@ -654,7 +654,8 @@
1.32 // Condition is true, process it!
1.33 // The text may still contain arithmetic exprs or other cond. exprs
1.34 // so send it through do_input
1.35 - do_input(argc, argv, outfile, sect.substr(colon+1, sect.size() - colon - 3), curvars);
1.36 + string tmp(sect.substr(colon+1, sect.size() - colon - 3));
1.37 + do_input(argc, argv, outfile, tmp, curvars);
1.38 }
1.39 }
1.40 }
1.41 @@ -687,7 +688,8 @@
1.42 const int MAX_ARGC = 10;
1.43 int converted_argv[MAX_ARGC];
1.44
1.45 - for (int i = 0; i < argc && i < MAX_ARGC; ++i)
1.46 + int i;
1.47 + for (i = 0; i < argc && i < MAX_ARGC; ++i)
1.48 converted_argv[i] = atoi(argv[i]);
1.49
1.50 if (argc != i)