From a56c451c1294707e449f2c56cdcedeff9528296b Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Sat, 13 Aug 2005 15:39:51 +0000 Subject: [PATCH] Fix format errors. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2312 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/wx-console/console_thread.cpp | 2 +- bacula/src/wx-console/wxbrestorepanel.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bacula/src/wx-console/console_thread.cpp b/bacula/src/wx-console/console_thread.cpp index 46cce53793..eb54a5bc1e 100644 --- a/bacula/src/wx-console/console_thread.cpp +++ b/bacula/src/wx-console/console_thread.cpp @@ -322,7 +322,7 @@ void* console_thread::Entry() { csprint(wxString(wxT(" ")) << (i+1) << wxT(": ") << wxString(res[i]->hdr.name,*wxConvCurrent) << wxT("\n")); } } - csprint(wxString::Format(wxT(_("Please choose a director (1-%s): ")), count), CS_DATA); + csprint(wxString::Format(wxT(_("Please choose a director (1-%d): ")), count), CS_DATA); csprint(NULL, CS_PROMPT); choosingdirector = true; directorchoosen = -1; diff --git a/bacula/src/wx-console/wxbrestorepanel.cpp b/bacula/src/wx-console/wxbrestorepanel.cpp index ecb72d1bb3..ae4a90b4fc 100644 --- a/bacula/src/wx-console/wxbrestorepanel.cpp +++ b/bacula/src/wx-console/wxbrestorepanel.cpp @@ -738,7 +738,7 @@ void wxbRestorePanel::CmdStart() { } wxbMainFrame::GetInstance()->SetStatusText( - wxString::Format(wxT(_("Please configure your restore (%s files selected to be restored)...")), totfilemessages)); + wxString::Format(wxT(_("Please configure your restore (%ld files selected to be restored)...")), totfilemessages)); UpdateSecondConfig(dt); @@ -843,7 +843,7 @@ void wxbRestorePanel::CmdStart() { break; case JS_Running: wxbMainFrame::GetInstance()->SetStatusText( - wxString::Format(wxT(_("Restore job running, please wait (%d of %d files restored)...")), filemessages, totfilemessages)); + wxString::Format(wxT(_("Restore job running, please wait (%ld of %ld files restored)...")), filemessages, totfilemessages)); waitforever = true; break; case JS_Terminated: -- 2.39.5