va_start(ap, msg);
std::vsnprintf(buffer, sizeof buffer, msg, ap);
ioMsg_ = SaveDefaultCharacter(buffer, std::strlen(buffer) + 1, *this);
+ va_end(ap);
}
}
} else if (msg) {
va_list ap;
va_start(ap, msg);
CrashArgs(msg, ap);
+ va_end(ap);
} else if (const char *errstr{IostatErrorString(iostatOrErrno)}) {
Crash(errstr);
} else {
}
Terminator terminator{__FILE__, __LINE__};
IoErrorHandler handler{terminator};
- unitMap = New<UnitMap>{terminator}().release();
- ExternalFileUnit &out{ExternalFileUnit::CreateNew(6, terminator)};
+ UnitMap *newUnitMap{New<UnitMap>{terminator}().release()};
+ bool wasExtant{false};
+ ExternalFileUnit &out{newUnitMap->LookUpOrCreate(6, terminator, wasExtant)};
+ RUNTIME_CHECK(terminator, !wasExtant);
out.Predefine(1);
out.SetDirection(Direction::Output, handler);
defaultOutput = &out;
- ExternalFileUnit &in{ExternalFileUnit::CreateNew(5, terminator)};
+ ExternalFileUnit &in{newUnitMap->LookUpOrCreate(5, terminator, wasExtant)};
+ RUNTIME_CHECK(terminator, !wasExtant);
in.Predefine(0);
in.SetDirection(Direction::Input, handler);
defaultInput = ∈
// TODO: Set UTF-8 mode from the environment
+ unitMap = newUnitMap;
return *unitMap;
}