mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r22101) -Codechange (r22098): Unify a bit of code.

This commit is contained in:
alberth 2011-02-18 20:51:05 +00:00
parent 8c2fc45153
commit 41a67a9b94
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/misc/getoptdata.cpp
View File

@ -56,28 +56,21 @@ set_optval: // Handle option value of *odata .
return odata->id;
case ODF_HAS_VALUE:
if (this->cont != NULL) { // Remainder of the argument is the option value.
this->opt = this->cont;
this->cont = NULL;
return odata->id;
}
if (this->numleft == 0) return -2; // Missing the option value.
this->opt = this->argv[0];
this->argv++;
this->numleft--;
return odata->id;
case ODF_OPTIONAL_VALUE:
if (this->cont != NULL) { // Remainder of the argument is the option value.
this->opt = this->cont;
this->cont = NULL;
return odata->id;
}
if (this->numleft > 0 && this->argv[0][0] != '-') {
this->opt = this->argv[0];
this->argv++;
this->numleft--;
}
/* No more arguments, either return an error or a value-less option. */
if (this->numleft == 0) return (odata->flags == ODF_HAS_VALUE) ? -2 : odata->id;
/* Next argument looks like another option, let's not return it as option value. */
if (odata->flags == ODF_OPTIONAL_VALUE && this->argv[0][0] == '-') return odata->id;
this->opt = this->argv[0]; // Next argument is the option value.
this->argv++;
this->numleft--;
return odata->id;
default: NOT_REACHED();