Mercurial > hg > sidinfo
comparison sidinfo.c @ 125:ffccc712409a
Fix build.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 26 Oct 2016 11:59:15 +0300 |
parents | a2c2c63311de |
children | c1462b7880e8 |
comparison
equal
deleted
inserted
replaced
124:6bbec928dfbb | 125:ffccc712409a |
---|---|
431 if (optFieldOutput) | 431 if (optFieldOutput) |
432 fputs(optOneLine ? optFieldSep : "\n", outFile); | 432 fputs(optOneLine ? optFieldSep : "\n", outFile); |
433 } | 433 } |
434 | 434 |
435 | 435 |
436 static void siPrintPSIDInfoLine(FILE *outFile, BOOL *shown, const int xindex, const char *xfmt, const char *xaltfmt, ...) | 436 static void siPrintPSIDInfoLine(FILE *outFile, BOOL *shown, const PSFOption *opt, const char *xfmt, const char *xaltfmt, ...) |
437 { | 437 { |
438 const PSFOption *opt = &optPSOptions[xindex]; | |
439 va_list ap; | 438 va_list ap; |
440 const char *fmt = optHexadecimal ? (xaltfmt != NULL ? xaltfmt : xfmt) : xfmt; | 439 const char *fmt = optHexadecimal ? (xaltfmt != NULL ? xaltfmt : xfmt) : xfmt; |
441 | 440 |
442 siPrintFieldPrefix(outFile, opt); | 441 siPrintFieldPrefix(outFile, opt); |
443 | 442 |
448 siPrintFieldSeparator(outFile); | 447 siPrintFieldSeparator(outFile); |
449 *shown = TRUE; | 448 *shown = TRUE; |
450 } | 449 } |
451 | 450 |
452 | 451 |
453 #define PR(xfmt, xaltfmt, ...) siPrintPSIDInfoLine(outFile, shown, xindex, xfmt, xaltfmt, __VA_ARGS__ ) | 452 #define PR(xfmt, xaltfmt, ...) siPrintPSIDInfoLine(outFile, shown, opt, xfmt, xaltfmt, __VA_ARGS__ ) |
454 | 453 |
455 | 454 |
456 static void siPrintPSIDInformationField(FILE *outFile, const char *filename, const PSIDHeader *psid, BOOL *shown, const PSFStackItem *item) | 455 static void siPrintPSIDInformationField(FILE *outFile, const char *filename, const PSIDHeader *psid, BOOL *shown, const PSFStackItem *item) |
457 { | 456 { |
458 const PSFOption *opt = &optPSOptions[item->cmd]; | 457 const PSFOption *opt = &optPSOptions[item->cmd]; |