From 0e0f43895af285a73e8512ab823a021295b212b2 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 1 Dec 2022 00:15:37 -0600 Subject: [PATCH] [nostalgia/tools/pack] Improve output and fix a sign conversion --- src/nostalgia/tools/pack.cpp | 4 ++-- src/nostalgia/tools/pack/pack.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nostalgia/tools/pack.cpp b/src/nostalgia/tools/pack.cpp index 31309ef36..4c38f9fbb 100644 --- a/src/nostalgia/tools/pack.cpp +++ b/src/nostalgia/tools/pack.cpp @@ -69,8 +69,8 @@ static ox::Error run(const ox::ClArgs &args) noexcept { oxRequireM(romBuff, readFileBuff(argRomBin.c_str())); oxReturnError(appendBinary(&romBuff, &dstBuff, pl.get())); - oxOutf("new size: {} bytes\n", dstSize); - oxOutf("preload buff size: {} bytes\n", pl->buff().size()); + oxOutf("Dest FS size: {} bytes\n", dstSize); + oxOutf("Preload buff size: {} bytes\n", pl->buff().size()); oxOutf("ROM buff size: {} bytes\n", romBuff.size()); oxReturnError(writeFileBuff(argRomBin, romBuff)); diff --git a/src/nostalgia/tools/pack/pack.cpp b/src/nostalgia/tools/pack/pack.cpp index 8d21536f1..b0ab5e4fc 100644 --- a/src/nostalgia/tools/pack/pack.cpp +++ b/src/nostalgia/tools/pack/pack.cpp @@ -188,7 +188,7 @@ static ox::Error padbin(ox::BufferWriter *w, unsigned factor) noexcept { ox::Error appendBinary(ox::Buffer *binBuff, ox::Buffer *fsBuff, GbaPreloader *pl) noexcept { constexpr ox::StringView mediaHdr = "NOSTALGIA_MEDIA_HEADER__________"; constexpr ox::StringView preloadHdr = "NOSTALGIA_PRELOAD_HEADER________"; - constexpr auto hdrSize = 32; + constexpr auto hdrSize = 32u; static_assert(mediaHdr.bytes() == hdrSize); static_assert(preloadHdr.bytes() == hdrSize); ox::BufferWriter w(binBuff);