Mercurial > hg > sidinfo
comparison sidinfo.c @ 115:6843261b4cd6
Cleanups.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 15 Feb 2016 11:33:36 +0200 |
parents | cc74a9871a44 |
children | d062312ea850 |
comparison
equal
deleted
inserted
replaced
114:cc74a9871a44 | 115:6843261b4cd6 |
---|---|
495 (i < psid->lengths->nlengths - 1) ? " " : ""); | 495 (i < psid->lengths->nlengths - 1) ? " " : ""); |
496 } | 496 } |
497 } | 497 } |
498 siPrintFieldSeparator(outFile); | 498 siPrintFieldSeparator(outFile); |
499 break; | 499 break; |
500 | |
501 } | 500 } |
502 } | 501 } |
503 | 502 |
504 | 503 |
505 BOOL argHandleFile(char *filename) | 504 BOOL argHandleFile(char *filename) |
583 optNoNamePrefix = TRUE; | 582 optNoNamePrefix = TRUE; |
584 } | 583 } |
585 | 584 |
586 if (optFieldOutput && !optFormat.nitems) | 585 if (optFieldOutput && !optFormat.nitems) |
587 { | 586 { |
587 PSFStackItem item; | |
588 int i; | 588 int i; |
589 memset(&item, 0, sizeof(item)); | |
589 siClearStack(&optFormat); | 590 siClearStack(&optFormat); |
590 for (i = 0; i < noptPSOptions; i++) | 591 for (i = 0; i < noptPSOptions; i++) |
591 { | 592 { |
592 PSFStackItem item; | |
593 item.cmd = i; | 593 item.cmd = i; |
594 item.str = NULL; | |
595 siStackAddItem(&optFormat, &item); | 594 siStackAddItem(&optFormat, &item); |
596 } | 595 } |
597 } | 596 } |
598 | 597 |
599 // Check paths | 598 // Check paths |
613 THERR("Could not open SLDB '%s'.\n", | 612 THERR("Could not open SLDB '%s'.\n", |
614 setSLDBPath); | 613 setSLDBPath); |
615 goto err; | 614 goto err; |
616 } | 615 } |
617 | 616 |
618 THMSG(0, "Reading SLDB.\n"); | 617 THMSG(1, "Reading SLDB.\n"); |
619 if ((sidSLDB = si_sldb_new()) == NULL) | 618 if ((sidSLDB = si_sldb_new()) == NULL) |
620 { | 619 { |
621 THERR("Could not allocate SLDB structure!\n"); | 620 THERR("Could not allocate SLDB structure!\n"); |
622 goto err; | 621 goto err; |
623 } | 622 } |