mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-21 21:49:10 +00:00
Code Issues Activity

(svn r16421) -Codechange: do not unnecessarily remove constness or unnecessarily add it.

Browse Source
This commit is contained in:
rubidium
2009-05-24 20:29:04 +00:00
parent 36e71c8df6
commit 0d99b6c71c
33 changed files with 108 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openttd.cpp
View File

@@ -206,7 +206,7 @@ struct MyGetOptData {
int numleft;
char **argv;
const char *options;
const char *cont;
char *cont;
MyGetOptData(int argc, char **argv, const char *options)
{
@@ -220,9 +220,7 @@ struct MyGetOptData {
static int MyGetOpt(MyGetOptData *md)
{
const char *s, *r, *t;
s = md->cont;
char *s = md->cont;
if (s != NULL)
goto md_continue_here;
@@ -234,12 +232,14 @@ static int MyGetOpt(MyGetOptData *md)
md_continue_here:;
s++;
if (*s != 0) {
const char *r;
/* Found argument, try to locate it in options. */
if (*s == ':' || (r = strchr(md->options, *s)) == NULL) {
/* ERROR! */
return -2;
}
if (r[1] == ':') {
char *t;
/* Item wants an argument. Check if the argument follows, or if it comes as a separate arg. */
if (!*(t = s + 1)) {
/* It comes as a separate arg. Check if out of args? */
@@ -253,7 +253,7 @@ md_continue_here:;
md->argv++;
}
}
md->opt = (char*)t;
md->opt = t;
md->cont = NULL;
return *s;
}