From f68efb758e21d065c4e2d37da6c6c55a95950b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= Date: Fri, 15 Jan 2021 19:41:48 +0100 Subject: [PATCH] fix: printf: some potentially severe format errors --- src/dvdisaster.c | 2 +- src/endian.c | 2 +- src/large-io.c | 2 +- src/preferences.c | 2 +- src/read-linear.c | 2 +- src/rs02-create.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dvdisaster.c b/src/dvdisaster.c index f5450c2..47ace29 100644 --- a/src/dvdisaster.c +++ b/src/dvdisaster.c @@ -534,7 +534,7 @@ int main(int argc, char *argv[]) Closure->prefetchSectors = atoi(optarg); if( Closure->prefetchSectors < 32 || Closure->prefetchSectors > MAX_PREFETCH_CACHE_SIZE) - Stop(_("--prefetch-sectors must be in range 32...%s"), + Stop(_("--prefetch-sectors must be in range 32...%d"), MAX_PREFETCH_CACHE_SIZE); break; case MODIFIER_RANDOM_SEED: diff --git a/src/endian.c b/src/endian.c index e0b2f76..df007cf 100644 --- a/src/endian.c +++ b/src/endian.c @@ -114,7 +114,7 @@ void print_crc_block(CrcBlock *cb) PrintCLI("fpSector %8x\n", cb->fpSector); print_hex("mediumFP ", cb->mediumFP, 16); print_hex("mediumSum ", cb->mediumSum, 16); - PrintCLI("dataSectors %ll16x\n ",cb->dataSectors); + PrintCLI("dataSectors %16" PRIx64 "\n",cb->dataSectors); PrintCLI("inLast %8x\n", cb->inLast); PrintCLI("dataBytes %8x\n", cb->dataBytes); PrintCLI("eccBytes %8x\n", cb->eccBytes); diff --git a/src/large-io.c b/src/large-io.c index b3aa295..7b913e9 100644 --- a/src/large-io.c +++ b/src/large-io.c @@ -260,7 +260,7 @@ static ssize_t xwrite(int fdes, void *buf_base, size_t count) answer = ModalDialog(GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, insert_buttons, _("Error while writing the file:\n\n%s\n\n" "You can redo this operation after freeing some space."), - strerror(errno),n); + strerror(errno)); if(!answer) return total; } diff --git a/src/preferences.c b/src/preferences.c index aa5d90d..c683b86 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -1490,7 +1490,7 @@ void CreatePreferencesWindow(void) "- reading defective media\n" "- if (and only if) error correction data is available.\n\n" "Using the adaptive strategy without error correction data " - "is possible but it is recommended to use linear reading in that case."), Closure->invisibleDash); + "is possible but it is recommended to use linear reading in that case.")); /* Reading range */ diff --git a/src/read-linear.c b/src/read-linear.c index bb0421f..583fa3b 100644 --- a/src/read-linear.c +++ b/src/read-linear.c @@ -890,7 +890,7 @@ void ReadMediumLinear(gpointer data) { #ifndef CLI SwitchAndSetFootline(Closure->readLinearNotebook, 1, Closure->readLinearFootline, - _("Aborted by user request!"), + _("Aborted by user request! %" PRId64 " sectors read, %" PRId64 " sectors unreadable/skipped so far."), Closure->redMarkup, rc->readOK,Closure->readErrors); #endif rc->unreportedError = FALSE; /* suppress respective error message */ diff --git a/src/rs02-create.c b/src/rs02-create.c index 1422382..2cf994f 100644 --- a/src/rs02-create.c +++ b/src/rs02-create.c @@ -244,7 +244,7 @@ static void check_image(ecc_closure *ec) "from a damaged medium which was NOT fully recovered.\n" "This means that some files may have been silently corrupted.\n\n" "Error correction information can only be\n" - "appended to complete (undamaged) images.\n")); + "appended to complete (undamaged) images.\n"), sectors); } /* Update and cache the CRC sums */