diff options
| author | Ben Gamari <ben@well-typed.com> | 2022-01-27 18:17:32 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-01-30 06:27:19 -0500 |
| commit | 3531c4784c0a06063dcfc0f084943d5149e64035 (patch) | |
| tree | 6ddf37828d9aa6f91b7246a92411225be3b96278 | |
| parent | 3af95f7a9acc82f61c27a8ac7eba8202dc8c8819 (diff) | |
| download | haskell-3531c4784c0a06063dcfc0f084943d5149e64035.tar.gz | |
Use PATH_FMT instead of %s to format `pathchar *`
A few %s occurrences have snuck in over the past months.
| -rw-r--r-- | rts/Linker.c | 4 | ||||
| -rw-r--r-- | testsuite/tests/rts/linker/linker_error.c | 2 | ||||
| -rw-r--r-- | testsuite/tests/rts/linker/linker_unload.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/rts/Linker.c b/rts/Linker.c index ebb80a955c..e30fadb262 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -1343,7 +1343,7 @@ freePreloadObjectFile (ObjectCode *oc) */ void freeObjectCode (ObjectCode *oc) { - IF_DEBUG(linker, debugBelch("freeObjectCode: %s", oc->fileName)); + IF_DEBUG(linker, debugBelch("freeObjectCode: %" PATH_FMT, oc->fileName)); if (oc->type == DYNAMIC_OBJECT) { #if defined(OBJFORMAT_ELF) @@ -1444,7 +1444,7 @@ mkOc( ObjectType type, pathchar *path, char *image, int imageSize, ObjectCode* oc; - IF_DEBUG(linker, debugBelch("mkOc: %s\n", path)); + IF_DEBUG(linker, debugBelch("mkOc: %" PATH_FMT "\n", path)); oc = stgMallocBytes(sizeof(ObjectCode), "mkOc(oc)"); oc->info = NULL; diff --git a/testsuite/tests/rts/linker/linker_error.c b/testsuite/tests/rts/linker/linker_error.c index 3654808607..f66178671d 100644 --- a/testsuite/tests/rts/linker/linker_error.c +++ b/testsuite/tests/rts/linker/linker_error.c @@ -51,7 +51,7 @@ int main (int argc, char *argv[]) for (i=0; i < ITERATIONS; i++) { r = loadObj(obj); if (!r) { - debugBelch("loadObj(%s) failed\n", obj); + debugBelch("loadObj(%" PATH_FMT ") failed\n", obj); continue; } r = resolveObjs(); diff --git a/testsuite/tests/rts/linker/linker_unload.c b/testsuite/tests/rts/linker/linker_unload.c index 159570314a..9a4779a1c4 100644 --- a/testsuite/tests/rts/linker/linker_unload.c +++ b/testsuite/tests/rts/linker/linker_unload.c @@ -32,7 +32,7 @@ int main (int argc, char *argv[]) for (i=0; i < ITERATIONS; i++) { r = loadObj(OBJPATH); if (!r) { - errorBelch("loadObj(%s) failed", OBJPATH); + errorBelch("loadObj(%" PATH_FMT ") failed", OBJPATH); exit(1); } r = resolveObjs(); @@ -63,7 +63,7 @@ int main (int argc, char *argv[]) for (i=0; i < ITERATIONS; i++) { r = loadObj(OBJPATH); if (!r) { - errorBelch("loadObj(%s) failed", OBJPATH); + errorBelch("loadObj(%" PATH_FMT ") failed", OBJPATH); exit(1); } r = resolveObjs(); |