From 68410d35d37fc72dfc4f55ea2e7d04b9bb2829d1 Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Sat, 23 Nov 2019 23:00:44 +0100 Subject: [PATCH] Get rid of `unlocked_stdio` functions Those did not provide a significant speedup, and are not provided by mingw --- src/link/output.c | 11 ++++------- src/link/script.c | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/link/output.c b/src/link/output.c index 597d2d8f..37913e71 100644 --- a/src/link/output.c +++ b/src/link/output.c @@ -150,9 +150,8 @@ static void writeBank(struct SortedSection *bankSections, uint16_t baseOffset, /* Output padding up to the next SECTION */ while (offset + baseOffset < section->org) { - putc_unlocked(overlayFile ? getc_unlocked(overlayFile) - : padValue, - outputFile); + putc(overlayFile ? getc(overlayFile) : padValue, + outputFile); offset++; } @@ -162,7 +161,7 @@ static void writeBank(struct SortedSection *bankSections, uint16_t baseOffset, if (overlayFile) { /* Skip bytes even with pipes */ for (uint16_t i = 0; i < section->size; i++) - getc_unlocked(overlayFile); + getc(overlayFile); } offset += section->size; @@ -170,9 +169,7 @@ static void writeBank(struct SortedSection *bankSections, uint16_t baseOffset, } while (offset < size) { - putc_unlocked(overlayFile ? getc_unlocked(overlayFile) - : padValue, - outputFile); + putc(overlayFile ? getc(overlayFile) : padValue, outputFile); offset++; } } diff --git a/src/link/script.c b/src/link/script.c index 3a854f06..f691778d 100644 --- a/src/link/script.c +++ b/src/link/script.c @@ -164,7 +164,7 @@ static char const * const commands[] = { static int readChar(FILE *file) { - int curchar = getc_unlocked(file); + int curchar = getc(file); if (curchar == EOF && ferror(file)) err(1, "%s(%u): Unexpected error in %s", linkerScriptName,