diff options
| author | Peter Eisentraut | 2025-03-29 09:30:08 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2025-03-29 09:43:57 +0000 |
| commit | a0ed19e0a9efe93b3b83d6e3fe8f77656be253a2 (patch) | |
| tree | 8c1040a46a47098d3fe5199530576a1a68acc20f /src/bin/pg_verifybackup | |
| parent | a0a4601765b896079eb82a9d5cfa1f41154fcfdb (diff) | |
Use PRI?64 instead of "ll?" in format strings (continued).
Continuation of work started in commit 15a79c73, after initial trial.
Author: Thomas Munro <[email protected]>
Discussion: https://postgr.es/m/b936d2fb-590d-49c3-a615-92c3a88c6c19%40eisentraut.org
Diffstat (limited to 'src/bin/pg_verifybackup')
| -rw-r--r-- | src/bin/pg_verifybackup/astreamer_verify.c | 16 | ||||
| -rw-r--r-- | src/bin/pg_verifybackup/pg_verifybackup.c | 11 |
2 files changed, 13 insertions, 14 deletions
diff --git a/src/bin/pg_verifybackup/astreamer_verify.c b/src/bin/pg_verifybackup/astreamer_verify.c index 6c3a132ea3a..079c3970410 100644 --- a/src/bin/pg_verifybackup/astreamer_verify.c +++ b/src/bin/pg_verifybackup/astreamer_verify.c @@ -207,11 +207,11 @@ member_verify_header(astreamer *streamer, astreamer_member *member) if (m->size != member->size) { report_backup_error(mystreamer->context, - "\"%s\" has size %llu in \"%s\" but size %llu in the manifest", + "\"%s\" has size %llu in \"%s\" but size %" PRIu64 " in the manifest", member->pathname, (unsigned long long) member->size, mystreamer->archive_name, - (unsigned long long) m->size); + m->size); m->bad = true; return; } @@ -296,10 +296,10 @@ member_verify_checksum(astreamer *streamer) if (mystreamer->checksum_bytes != m->size) { report_backup_error(mystreamer->context, - "file \"%s\" in \"%s\" should contain %llu bytes, but read %llu bytes", + "file \"%s\" in \"%s\" should contain %" PRIu64 " bytes, but read %" PRIu64 " bytes", m->pathname, mystreamer->archive_name, - (unsigned long long) m->size, - (unsigned long long) mystreamer->checksum_bytes); + m->size, + mystreamer->checksum_bytes); return; } @@ -408,11 +408,11 @@ member_verify_control_data(astreamer *streamer) /* System identifiers should match. */ if (manifest->system_identifier != mystreamer->control_file.system_identifier) - report_fatal_error("%s: %s: manifest system identifier is %llu, but control file has %llu", + report_fatal_error("%s: %s: manifest system identifier is %" PRIu64 ", but control file has %" PRIu64, mystreamer->archive_name, mystreamer->mfile->pathname, - (unsigned long long) manifest->system_identifier, - (unsigned long long) mystreamer->control_file.system_identifier); + manifest->system_identifier, + mystreamer->control_file.system_identifier); } /* diff --git a/src/bin/pg_verifybackup/pg_verifybackup.c b/src/bin/pg_verifybackup/pg_verifybackup.c index 84edd2cdca5..383668a8b6a 100644 --- a/src/bin/pg_verifybackup/pg_verifybackup.c +++ b/src/bin/pg_verifybackup/pg_verifybackup.c @@ -770,10 +770,10 @@ verify_control_file(const char *controlpath, uint64 manifest_system_identifier) /* System identifiers should match. */ if (manifest_system_identifier != control_file->system_identifier) - report_fatal_error("%s: manifest system identifier is %llu, but control file has %llu", + report_fatal_error("%s: manifest system identifier is %" PRIu64 ", but control file has %" PRIu64, controlpath, - (unsigned long long) manifest_system_identifier, - (unsigned long long) control_file->system_identifier); + manifest_system_identifier, + control_file->system_identifier); /* Release memory. */ pfree(control_file); @@ -1165,9 +1165,8 @@ verify_file_checksum(verifier_context *context, manifest_file *m, if (bytes_read != m->size) { report_backup_error(context, - "file \"%s\" should contain %llu bytes, but read %llu bytes", - relpath, (unsigned long long) m->size, - (unsigned long long) bytes_read); + "file \"%s\" should contain %" PRIu64 " bytes, but read %" PRIu64, + relpath, m->size, bytes_read); return; } |