From 969c176d825b5dce43a806fefbe6e37ef69d5fcc Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Mon, 5 Oct 2020 21:15:42 +0900 Subject: [PATCH] tools/locale: Fix -Wformat= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2261a75e32a78fb3e43735bc9c616e101d6d39f5 Reviewed-on: https://review.haiku-os.org/c/haiku/+/3313 Reviewed-by: Jérôme Duval --- src/tools/locale/DefaultCatalog.cpp | 8 +++++--- src/tools/locale/collectcatkeys.cpp | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/tools/locale/DefaultCatalog.cpp b/src/tools/locale/DefaultCatalog.cpp index 1f480cbd2b..d1a44f46e0 100644 --- a/src/tools/locale/DefaultCatalog.cpp +++ b/src/tools/locale/DefaultCatalog.cpp @@ -151,7 +151,8 @@ DefaultCatalog::ReadFromFile(const char *path) BStackOrHeapArray buf(sz); if (!buf.IsValid()) { - fprintf(stderr, "couldn't allocate array of %Ld chars\n", sz); + fprintf(stderr, "couldn't allocate array of %" B_PRIdOFF " chars\n", + sz); return B_NO_MEMORY; } res = catalogFile.Read(buf, sz); @@ -161,8 +162,9 @@ DefaultCatalog::ReadFromFile(const char *path) } if (res < sz) { fprintf(stderr, - "only got %u instead of %Lu bytes from catalog-file %s\n", res, sz, - path); + "only got %u instead of %" B_PRIdOFF " bytes " + "from catalog-file %s\n", + res, sz, path); return res; } BMemoryIO memIO(buf, sz); diff --git a/src/tools/locale/collectcatkeys.cpp b/src/tools/locale/collectcatkeys.cpp index 78ded2deb6..e14d6d5a6a 100644 --- a/src/tools/locale/collectcatkeys.cpp +++ b/src/tools/locale/collectcatkeys.cpp @@ -287,7 +287,8 @@ main(int argc, char **argv) char *buf = inputStr.LockBuffer(sz); off_t rsz = inFile.Read(buf, sz); if (rsz < sz) { - fprintf(stderr, "couldn't read %Ld bytes from %s (got only %Ld)\n", + fprintf(stderr, "couldn't read %" B_PRIdOFF " bytes from %s " + "(got only %" B_PRIdOFF ")\n", sz, inputFile, rsz); exit(-1); }