Mercurial > hg > dmlib

comparison tools/objlink.c @ 2512:14ed64742010

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 30 Apr 2020 10:34:55 +0300
parents 69a5af2eb1ea
children c6ee41fd98dd
comparison
equal deleted inserted replaced
2511:6f2572b6f151 2512:14ed64742010
369 } 369 }
370 370
371 371
372 BOOL argHandleOpt(const int optN, char *optArg, char *currArg) 372 BOOL argHandleOpt(const int optN, char *optArg, char *currArg)
373 { 373 {
374 char *p;
375 unsigned int tmpi;
376 374
377 switch (optN) 375 switch (optN)
378 { 376 {
379 case 0: 377 case 0:
380 argShowHelp(); 378 argShowHelp();
465 } 463 }
466 break; 464 break;
467 465
468 case 26: 466 case 26:
469 // Initialization value 467 // Initialization value
470 optInitValueType = 1;
471 if ((p = strrchr(optArg, ':')) != NULL)
472 { 468 {
473 *p = 0; 469 char *p;
474 switch (tolower(p[1])) 470 unsigned int tmpi;
471
472 optInitValueType = 1;
473 if ((p = strrchr(optArg, ':')) != NULL)
475 { 474 {
476 case 'b': optInitValueType = 1; break; 475 *p = 0;
477 case 'w': optInitValueType = 2; break; 476 switch (tolower(p[1]))
478 case 'd': optInitValueType = 4; break; 477 {
479 default: 478 case 'b': optInitValueType = 1; break;
480 dmErrorMsg("Invalid init value type '%c' specified for '%s'.\n", 479 case 'w': optInitValueType = 2; break;
481 p[1], optArg); 480 case 'd': optInitValueType = 4; break;
482 return FALSE; 481 default:
482 dmErrorMsg("Invalid init value type '%c' specified for '%s'.\n",
483 p[1], optArg);
484 return FALSE;
485 }
483 } 486 }
487 if (!dmGetIntVal(optArg, &tmpi, NULL))
488 {
489 dmErrorMsg("Invalid initvalue '%s'.\n", optArg);
490 return FALSE;
491 }
492 optInitValue = tmpi;
484 } 493 }
485 if (!dmGetIntVal(optArg, &tmpi, NULL))
486 {
487 dmErrorMsg("Invalid initvalue '%s'.\n", optArg);
488 return FALSE;
489 }
490 optInitValue = tmpi;
491 break; 494 break;
492 495
493 case 28: 496 case 28:
494 // Set describe mode 497 // Set describe mode
495 optDescribe = TRUE; 498 optDescribe = TRUE;
517 { 520 {
518 optLoadAddress = LA_NONE; 521 optLoadAddress = LA_NONE;
519 } 522 }
520 else 523 else
521 { 524 {
525 unsigned int tmpi;
526
522 if (!dmGetIntVal(optArg, &tmpi, NULL)) 527 if (!dmGetIntVal(optArg, &tmpi, NULL))
523 { 528 {
524 dmErrorMsg("Invalid loading address '%s'.\n", optArg); 529 dmErrorMsg("Invalid loading address '%s'.\n", optArg);
525 return FALSE; 530 return FALSE;
526 } 531 }