1 --- wxWidgets-2.8.12/src/common/appbase.cpp.orig 2011-03-22 12:59:40.000000000 +0100
2 +++ wxWidgets-2.8.12/src/common/appbase.cpp 2012-09-30 08:02:00.981833952 +0200
4 msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
5 lib.c_str(), progName.c_str(), prog.c_str());
7 - wxLogFatalError(msg.c_str());
8 + wxLogFatalError("%s", msg.c_str());
10 // normally wxLogFatalError doesn't return
12 --- wxWidgets-2.8.12/src/common/fs_mem.cpp.orig 2011-03-22 12:59:41.000000000 +0100
13 +++ wxWidgets-2.8.12/src/common/fs_mem.cpp 2012-09-30 10:11:49.745004943 +0200
16 if (m_Hash -> Get(filename) != NULL)
19 - s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str());
21 + wxLogError(_("Memory VFS already contains file '%s'!"), filename.c_str());
27 m_Hash -> Get(filename) == NULL)
30 - s.Printf(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str());
32 + wxLogError(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str());
36 --- wxWidgets-2.8.12/src/common/file.cpp.orig 2011-03-22 12:59:40.000000000 +0100
37 +++ wxWidgets-2.8.12/src/common/file.cpp 2012-09-30 08:19:02.785145988 +0200
39 if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
42 - wxLogSysError(_("Failed to set temporary file permissions"));
43 + wxLogSysError("%s", _("Failed to set temporary file permissions"));
47 --- wxWidgets-2.8.12/src/common/fileconf.cpp.orig 2011-03-22 12:59:41.000000000 +0100
48 +++ wxWidgets-2.8.12/src/common/fileconf.cpp 2012-09-30 08:20:45.761810510 +0200
51 if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF )
53 - wxLogError(_("Error reading config options."));
54 + wxLogError("%s", _("Error reading config options."));
60 if ( !file.IsOpened() )
62 - wxLogError(_("can't open user configuration file."));
63 + wxLogError("%s", _("can't open user configuration file."));
67 @@ -1057,13 +1057,13 @@
69 if ( !file.Write(filetext, *m_conv) )
71 - wxLogError(_("can't write user configuration file."));
72 + wxLogError("%s", _("can't write user configuration file."));
78 - wxLogError(_("Failed to update user configuration file."));
79 + wxLogError("%s", _("Failed to update user configuration file."));
84 wxCharBuffer buf(line.mb_str(conv));
85 if ( !os.Write(buf, strlen(buf)) )
87 - wxLogError(_("Error saving user configuration data."));
88 + wxLogError("%s", _("Error saving user configuration data."));
92 --- wxWidgets-2.8.12/src/common/filename.cpp.orig 2011-03-22 12:59:41.000000000 +0100
93 +++ wxWidgets-2.8.12/src/common/filename.cpp 2012-09-30 08:26:13.781803673 +0200
98 - wxLogSysError(_("Failed to create a temporary file name"));
99 + wxLogSysError("%s", _("Failed to create a temporary file name"));
104 // fails, though of course it should be protected against
105 // possible infinite looping too.
107 - wxLogError(_("Failed to open temporary file."));
108 + wxLogError("%s", _("Failed to open temporary file."));
112 --- wxWidgets-2.8.12/src/common/filefn.cpp.orig 2011-03-22 12:59:41.000000000 +0100
113 +++ wxWidgets-2.8.12/src/common/filefn.cpp 2012-09-30 09:03:28.965090416 +0200
114 @@ -1513,7 +1513,7 @@
118 - wxLogSysError(_("Failed to get the working directory"));
119 + wxLogSysError("%s", _("Failed to get the working directory"));
121 // VZ: the old code used to return "." on error which didn't make any
122 // sense at all to me - empty string is a better error indicator
123 --- wxWidgets-2.8.12/src/common/init.cpp.orig 2011-03-22 12:59:41.000000000 +0100
124 +++ wxWidgets-2.8.12/src/common/init.cpp 2012-09-30 09:06:52.951752832 +0200
127 if ( !wxModule::InitializeModules() )
129 - wxLogError(_("Initialization failed in post init, aborting."));
130 + wxLogError("%s", _("Initialization failed in post init, aborting."));
134 --- wxWidgets-2.8.12/src/common/stopwatch.cpp.orig 2011-03-22 12:59:42.000000000 +0100
135 +++ wxWidgets-2.8.12/src/common/stopwatch.cpp 2012-09-30 09:13:41.768410978 +0200
137 if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 ))
138 return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
140 - wxLogSysError(_("Failed to get the local system time"));
141 + wxLogSysError("%s", _("Failed to get the local system time"));
149 - wxLogError(_("wxGetTimeOfDay failed."));
150 + wxLogError("%s", _("wxGetTimeOfDay failed."));
153 #elif defined(HAVE_FTIME)
154 --- wxWidgets-2.8.12/src/common/tarstrm.cpp.orig 2011-03-22 12:59:42.000000000 +0100
155 +++ wxWidgets-2.8.12/src/common/tarstrm.cpp 2012-09-30 09:40:58.075043539 +0200
158 m_hdr->Read(*m_parent_i_stream);
159 if (m_parent_i_stream->Eof())
160 - wxLogError(_("incomplete header block in tar"));
161 + wxLogError("%s", _("incomplete header block in tar"));
162 if (!*m_parent_i_stream)
163 return wxSTREAM_READ_ERROR;
164 m_offset += TAR_BLOCKSIZE;
166 if (m_sumType == SUM_SIGNED)
167 ok = chksum == m_hdr->Sum(true);
169 - wxLogError(_("checksum failure reading tar header block"));
170 + wxLogError("%s", _("checksum failure reading tar header block"));
171 return wxSTREAM_READ_ERROR;
177 if (!ok || recPos < len || size != lastread) {
178 - wxLogWarning(_("invalid data in extended tar header"));
179 + wxLogWarning("%s", _("invalid data in extended tar header"));
184 wxFileOffset wxTarInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
187 - wxLogError(_("tar entry not open"));
188 + wxLogError("%s", _("tar entry not open"));
189 m_lasterror = wxSTREAM_READ_ERROR;
192 @@ -1018,7 +1018,7 @@
193 size_t wxTarInputStream::OnSysRead(void *buffer, size_t size)
196 - wxLogError(_("tar entry not open"));
197 + wxLogError("%s", _("tar entry not open"));
198 m_lasterror = wxSTREAM_READ_ERROR;
200 if (!IsOk() || !size)
201 @@ -1037,7 +1037,7 @@
202 } else if (!m_parent_i_stream->IsOk()) {
203 // any other error will have been reported by the underlying stream
204 if (m_parent_i_stream->Eof())
205 - wxLogError(_("unexpected end of file"));
206 + wxLogError("%s", _("unexpected end of file"));
207 m_lasterror = wxSTREAM_READ_ERROR;
210 @@ -1371,7 +1371,7 @@
213 if (sizePos == wxInvalidOffset || !m_hdr->SetOctal(TAR_SIZE, m_pos)) {
214 - wxLogError(_("incorrect size given for tar entry"));
215 + wxLogError("%s", _("incorrect size given for tar entry"));
216 m_lasterror = wxSTREAM_WRITE_ERROR;
219 @@ -1492,7 +1492,7 @@
220 wxFileOffset wxTarOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
223 - wxLogError(_("tar entry not open"));
224 + wxLogError("%s", _("tar entry not open"));
225 m_lasterror = wxSTREAM_WRITE_ERROR;
227 if (!IsOk() || m_datapos == wxInvalidOffset)
228 @@ -1514,7 +1514,7 @@
229 size_t wxTarOutputStream::OnSysWrite(const void *buffer, size_t size)
232 - wxLogError(_("tar entry not open"));
233 + wxLogError("%s", _("tar entry not open"));
234 m_lasterror = wxSTREAM_WRITE_ERROR;
236 if (!IsOk() || !size)
237 --- wxWidgets-2.8.12/src/common/zstream.cpp.orig 2011-03-22 12:59:43.000000000 +0100
238 +++ wxWidgets-2.8.12/src/common/zstream.cpp 2012-09-30 09:47:40.141701824 +0200
243 - wxLogError(_("Gzip not supported by this version of zlib"));
244 + wxLogError("%s", _("Gzip not supported by this version of zlib"));
245 m_lasterror = wxSTREAM_READ_ERROR;
252 - wxLogError(_("Can't initialize zlib inflate stream."));
253 + wxLogError("%s", _("Can't initialize zlib inflate stream."));
254 m_lasterror = wxSTREAM_READ_ERROR;
258 m_lasterror = wxSTREAM_EOF;
261 - wxLogError(_("Can't read inflate stream: unexpected EOF in underlying stream."));
262 + wxLogError("%s", _("Can't read inflate stream: unexpected EOF in underlying stream."));
268 // if gzip is asked for but not supported...
269 if (flags == wxZLIB_GZIP && !CanHandleGZip()) {
270 - wxLogError(_("Gzip not supported by this version of zlib"));
271 + wxLogError("%s", _("Gzip not supported by this version of zlib"));
272 m_lasterror = wxSTREAM_WRITE_ERROR;
279 - wxLogError(_("Can't initialize zlib deflate stream."));
280 + wxLogError("%s", _("Can't initialize zlib deflate stream."));
281 m_lasterror = wxSTREAM_WRITE_ERROR;
284 --- wxWidgets-2.8.12/src/common/zipstrm.cpp.orig 2011-03-22 12:59:42.000000000 +0100
285 +++ wxWidgets-2.8.12/src/common/zipstrm.cpp 2012-09-30 09:49:19.005033098 +0200
287 m_parent_o_stream = &stream;
289 if (deflateReset(m_deflate) != Z_OK) {
290 - wxLogError(_("can't re-initialize zlib deflate stream"));
291 + wxLogError("%s", _("can't re-initialize zlib deflate stream"));
292 m_lasterror = wxSTREAM_WRITE_ERROR;
296 m_parent_i_stream = &stream;
298 if (inflateReset(m_inflate) != Z_OK) {
299 - wxLogError(_("can't re-initialize zlib inflate stream"));
300 + wxLogError("%s", _("can't re-initialize zlib inflate stream"));
301 m_lasterror = wxSTREAM_READ_ERROR;
304 @@ -1269,7 +1269,7 @@
306 if (m_DiskNumber != 0 || m_StartDisk != 0 ||
307 m_EntriesHere != m_TotalEntries)
308 - wxLogWarning(_("assuming this is a multi-part zip concatenated"));
309 + wxLogWarning("%s", _("assuming this is a multi-part zip concatenated"));
313 @@ -1441,7 +1441,7 @@
314 // failed, so either this is a non-seekable stream (ok), or not a zip
315 if (m_parentSeekable) {
316 m_lasterror = wxSTREAM_READ_ERROR;
317 - wxLogError(_("invalid zip file"));
318 + wxLogError("%s", _("invalid zip file"));
322 @@ -1484,7 +1484,7 @@
326 - wxLogError(_("can't find central directory in zip"));
327 + wxLogError("%s", _("can't find central directory in zip"));
328 m_lasterror = wxSTREAM_READ_ERROR;
331 @@ -1570,7 +1570,7 @@
334 if (m_signature != CENTRAL_MAGIC) {
335 - wxLogError(_("error reading zip central directory"));
336 + wxLogError("%s", _("error reading zip central directory"));
337 return wxSTREAM_READ_ERROR;
340 @@ -1661,7 +1661,7 @@
344 - wxLogError(_("error reading zip local header"));
345 + wxLogError("%s", _("error reading zip local header"));
346 return wxSTREAM_READ_ERROR;
349 @@ -1709,7 +1709,7 @@
352 if (ReadSignature() != LOCAL_MAGIC) {
353 - wxLogError(_("bad zipfile offset to entry"));
354 + wxLogError("%s", _("bad zipfile offset to entry"));
358 @@ -1776,7 +1776,7 @@
359 switch (m_entry.GetMethod()) {
360 case wxZIP_METHOD_STORE:
361 if (m_entry.GetSize() == wxInvalidOffset) {
362 - wxLogError(_("stored file length not in Zip header"));
363 + wxLogError("%s", _("stored file length not in Zip header"));
366 m_store->Open(m_entry.GetSize());
367 @@ -1790,7 +1790,7 @@
371 - wxLogError(_("unsupported Zip compression method"));
372 + wxLogError("%s", _("unsupported Zip compression method"));
376 @@ -2171,7 +2171,7 @@
380 - wxLogError(_("unsupported Zip compression method"));
381 + wxLogError("%s", _("unsupported Zip compression method"));
385 --- wxWidgets-2.8.12/include/wx/unix/pipe.h.orig 2011-03-22 13:01:28.000000000 +0100
386 +++ wxWidgets-2.8.12/include/wx/unix/pipe.h 2012-09-30 09:52:41.701695539 +0200
389 if ( pipe(m_fds) == -1 )
391 - wxLogSysError(_("Pipe creation failed"));
392 + wxLogSysError("%s", _("Pipe creation failed"));
396 --- wxWidgets-2.8.12/src/unix/baseunix.cpp.orig 2011-03-22 13:01:28.000000000 +0100
397 +++ wxWidgets-2.8.12/src/unix/baseunix.cpp 2012-09-30 09:53:20.938361388 +0200
400 if ( waitpid(execData.pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
402 - wxLogSysError(_("Waiting for subprocess termination failed"));
403 + wxLogSysError("%s", _("Waiting for subprocess termination failed"));
407 --- wxWidgets-2.8.12/src/unix/snglinst.cpp.orig 2011-03-22 13:01:28.000000000 +0100
408 +++ wxWidgets-2.8.12/src/unix/snglinst.cpp 2012-09-30 10:01:41.101684296 +0200
410 // another process managed to open and lock the file and terminate
411 // (erasing it) before we got here, but this should happen so
412 // rarely in practice that we don't care
413 - wxLogError(_("Failed to access lock file."));
414 + wxLogError("%s", _("Failed to access lock file."));
419 ssize_t count = file.Read(buf, WXSIZEOF(buf));
420 if ( count == wxInvalidOffset )
422 - wxLogError(_("Failed to read PID from lock file."));
423 + wxLogError("%s", _("Failed to read PID from lock file."));
427 --- wxWidgets-2.8.12/src/unix/threadpsx.cpp.orig 2011-03-22 13:01:28.000000000 +0100
428 +++ wxWidgets-2.8.12/src/unix/threadpsx.cpp 2012-09-30 10:06:25.185011707 +0200
430 int rc = pthread_setspecific(gs_keySelf, thread);
433 - wxLogSysError(rc, _("Cannot start thread: error writing TLS"));
434 + wxLogSysError(rc, "%s", _("Cannot start thread: error writing TLS"));
439 // wxLogDebug: it is possible to bring the system to its knees
440 // by creating too many threads and not joining them quite
442 - wxLogError(_("Failed to join a thread, potential memory leak detected - please restart the program"));
443 + wxLogError("%s", _("Failed to join a thread, potential memory leak detected - please restart the program"));
446 m_shouldBeJoined = false;
447 @@ -1106,7 +1106,7 @@
449 if ( pthread_attr_getschedpolicy(&attr, &policy) != 0 )
451 - wxLogError(_("Cannot retrieve thread scheduling policy."));
452 + wxLogError("%s", _("Cannot retrieve thread scheduling policy."));
456 @@ -1133,7 +1133,7 @@
457 if ( prio != WXTHREAD_DEFAULT_PRIORITY )
459 // notify the programmer that this doesn't work here
460 - wxLogWarning(_("Thread priority setting is ignored."));
461 + wxLogWarning("%s", _("Thread priority setting is ignored."));
463 //else: we have default priority, so don't complain
465 @@ -1433,7 +1433,7 @@
466 if ( pthread_cancel(m_internal->GetId()) != 0 )
467 #endif // HAVE_PTHREAD_CANCEL
469 - wxLogError(_("Failed to terminate a thread."));
470 + wxLogError("%s", _("Failed to terminate a thread."));
472 return wxTHREAD_MISC_ERROR;
474 @@ -1615,7 +1615,7 @@
475 int rc = pthread_key_create(&gs_keySelf, NULL /* dtor function */);
478 - wxLogSysError(rc, _("Thread module initialization failed: failed to create thread key"));
479 + wxLogSysError(rc, "%s", _("Thread module initialization failed: failed to create thread key"));
483 --- wxWidgets-2.8.12/src/common/ftp.cpp.orig 2011-03-22 12:59:41.000000000 +0100
484 +++ wxWidgets-2.8.12/src/common/ftp.cpp 2012-09-30 10:18:44.061662974 +0200
486 if ( !sockSrv->WaitForAccept() )
488 m_lastError = wxPROTO_CONNERR;
489 - wxLogError(_("Timeout while waiting for FTP server to connect, try passive mode."));
490 + wxLogError("%s", _("Timeout while waiting for FTP server to connect, try passive mode."));
496 m_lastError = wxPROTO_PROTERR;
498 - wxLogError(_("The FTP server doesn't support the PORT command."));
499 + wxLogError("%s", _("The FTP server doesn't support the PORT command."));
505 if ( !DoSimpleCommand(_T("PASV")) )
507 - wxLogError(_("The FTP server doesn't support passive mode."));
508 + wxLogError("%s", _("The FTP server doesn't support passive mode."));
512 --- wxWidgets-2.8.12/src/unix/utilsunx.cpp.orig 2011-03-22 13:01:28.000000000 +0100
513 +++ wxWidgets-2.8.12/src/unix/utilsunx.cpp 2012-09-30 10:28:09.194984528 +0200
515 switch ( select(fd + 1, &readfds, NULL, NULL, &tv) )
518 - wxLogSysError(_("Impossible to get child process input"));
519 + wxLogSysError("%s", _("Impossible to get child process input"));
525 if ( pid == -1 ) // error?
527 - wxLogSysError( _("Fork failed") );
528 + wxLogSysError("%s", _("Fork failed") );
533 dup2(pipeOut[wxPipe::Write], STDOUT_FILENO) == -1 ||
534 dup2(pipeErr[wxPipe::Write], STDERR_FILENO) == -1 )
536 - wxLogSysError(_("Failed to redirect child process input/output"));
537 + wxLogSysError("%s", _("Failed to redirect child process input/output"));
545 - wxLogSysError(_("Cannot get the hostname"));
546 + wxLogSysError("%s", _("Cannot get the hostname"));
551 struct hostent *host = gethostbyname(wxSafeConvertWX2MB(buf));
554 - wxLogSysError(_("Cannot get the official hostname"));
555 + wxLogSysError("%s", _("Cannot get the official hostname"));