Mercurial > hg > dmlib
changeset 2512:14ed64742010
Cleanup.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 30 Apr 2020 10:34:55 +0300 |
| parents | 6f2572b6f151 |
| children | c72196d3fdbe |
| files | tools/objlink.c |
| diffstat | 1 files changed, 24 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/tools/objlink.c Thu Apr 30 08:51:21 2020 +0300 +++ b/tools/objlink.c Thu Apr 30 10:34:55 2020 +0300 @@ -371,8 +371,6 @@ BOOL argHandleOpt(const int optN, char *optArg, char *currArg) { - char *p; - unsigned int tmpi; switch (optN) { @@ -467,27 +465,32 @@ case 26: // Initialization value - optInitValueType = 1; - if ((p = strrchr(optArg, ':')) != NULL) { - *p = 0; - switch (tolower(p[1])) + char *p; + unsigned int tmpi; + + optInitValueType = 1; + if ((p = strrchr(optArg, ':')) != NULL) { - case 'b': optInitValueType = 1; break; - case 'w': optInitValueType = 2; break; - case 'd': optInitValueType = 4; break; - default: - dmErrorMsg("Invalid init value type '%c' specified for '%s'.\n", - p[1], optArg); - return FALSE; + *p = 0; + switch (tolower(p[1])) + { + case 'b': optInitValueType = 1; break; + case 'w': optInitValueType = 2; break; + case 'd': optInitValueType = 4; break; + default: + dmErrorMsg("Invalid init value type '%c' specified for '%s'.\n", + p[1], optArg); + return FALSE; + } } + if (!dmGetIntVal(optArg, &tmpi, NULL)) + { + dmErrorMsg("Invalid initvalue '%s'.\n", optArg); + return FALSE; + } + optInitValue = tmpi; } - if (!dmGetIntVal(optArg, &tmpi, NULL)) - { - dmErrorMsg("Invalid initvalue '%s'.\n", optArg); - return FALSE; - } - optInitValue = tmpi; break; case 28: @@ -519,6 +522,8 @@ } else { + unsigned int tmpi; + if (!dmGetIntVal(optArg, &tmpi, NULL)) { dmErrorMsg("Invalid loading address '%s'.\n", optArg);