]> git.pld-linux.org Git - packages/wxWidgets.git/blame - wxWidgets-format.patch
- more workarounds
[packages/wxWidgets.git] / wxWidgets-format.patch
CommitLineData
c885e705
JB
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
3@@ -424,7 +424,7 @@
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());
6
7- wxLogFatalError(msg.c_str());
8+ wxLogFatalError("%s", msg.c_str());
9
10 // normally wxLogFatalError doesn't return
11 return false;
47151347
JB
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
14@@ -174,9 +174,7 @@
15
16 if (m_Hash -> Get(filename) != NULL)
17 {
18- wxString s;
19- s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str());
20- wxLogError(s);
21+ wxLogError(_("Memory VFS already contains file '%s'!"), filename.c_str());
22 return false;
23 }
24 else
25@@ -226,9 +224,7 @@
26 if (m_Hash == NULL ||
27 m_Hash -> Get(filename) == NULL)
28 {
29- wxString s;
30- s.Printf(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str());
31- wxLogError(s);
32+ wxLogError(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str());
33 }
34
35 else
b44bd5fb
JB
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
38@@ -513,7 +513,7 @@
39 if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
40 {
41 #ifndef __OS2__
42- wxLogSysError(_("Failed to set temporary file permissions"));
43+ wxLogSysError("%s", _("Failed to set temporary file permissions"));
44 #endif
45 }
46 #endif // Unix
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
49@@ -508,7 +508,7 @@
50
51 if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF )
52 {
53- wxLogError(_("Error reading config options."));
54+ wxLogError("%s", _("Error reading config options."));
55 break;
56 }
57 }
58@@ -1043,7 +1043,7 @@
59
60 if ( !file.IsOpened() )
61 {
62- wxLogError(_("can't open user configuration file."));
63+ wxLogError("%s", _("can't open user configuration file."));
64 return false;
65 }
66
67@@ -1057,13 +1057,13 @@
68
69 if ( !file.Write(filetext, *m_conv) )
70 {
71- wxLogError(_("can't write user configuration file."));
72+ wxLogError("%s", _("can't write user configuration file."));
73 return false;
74 }
75
76 if ( !file.Commit() )
77 {
78- wxLogError(_("Failed to update user configuration file."));
79+ wxLogError("%s", _("Failed to update user configuration file."));
80
81 return false;
82 }
83@@ -1090,7 +1090,7 @@
84 wxCharBuffer buf(line.mb_str(conv));
85 if ( !os.Write(buf, strlen(buf)) )
86 {
87- wxLogError(_("Error saving user configuration data."));
88+ wxLogError("%s", _("Error saving user configuration data."));
89
90 return false;
91 }
8de26838
JB
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
94@@ -859,7 +859,7 @@
95
96 if ( path.empty() )
97 {
98- wxLogSysError(_("Failed to create a temporary file name"));
99+ wxLogSysError("%s", _("Failed to create a temporary file name"));
100 }
101 else
102 {
103@@ -894,7 +894,7 @@
104 // fails, though of course it should be protected against
105 // possible infinite looping too.
106
107- wxLogError(_("Failed to open temporary file."));
108+ wxLogError("%s", _("Failed to open temporary file."));
109
110 path.clear();
111 }
84f99935
JB
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 @@
115
116 if ( !ok )
117 {
118- wxLogSysError(_("Failed to get the working directory"));
119+ wxLogSysError("%s", _("Failed to get the working directory"));
120
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
3593df53
JB
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
125@@ -237,7 +237,7 @@
126
127 if ( !wxModule::InitializeModules() )
128 {
129- wxLogError(_("Initialization failed in post init, aborting."));
130+ wxLogError("%s", _("Initialization failed in post init, aborting."));
131 return false;
132 }
133
1b84f1e6
JB
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
136@@ -228,7 +228,7 @@
137 if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 ))
138 return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
139
140- wxLogSysError(_("Failed to get the local system time"));
141+ wxLogSysError("%s", _("Failed to get the local system time"));
142 return -1;
143 }
144
145@@ -286,7 +286,7 @@
146 }
147 else
148 {
149- wxLogError(_("wxGetTimeOfDay failed."));
4b62fc1e 150+ wxLogError("%s", _("wxGetTimeOfDay failed."));
1b84f1e6
JB
151 return 0;
152 }
153 #elif defined(HAVE_FTIME)
fd5caa00
JB
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
156@@ -790,7 +790,7 @@
157 while (!done) {
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;
165@@ -813,7 +813,7 @@
166 if (m_sumType == SUM_SIGNED)
167 ok = chksum == m_hdr->Sum(true);
168 if (!ok) {
169- wxLogError(_("checksum failure reading tar header block"));
170+ wxLogError("%s", _("checksum failure reading tar header block"));
171 return wxSTREAM_READ_ERROR;
172 }
173
174@@ -986,7 +986,7 @@
175 }
176
177 if (!ok || recPos < len || size != lastread) {
178- wxLogWarning(_("invalid data in extended tar header"));
179+ wxLogWarning("%s", _("invalid data in extended tar header"));
180 return false;
181 }
182
183@@ -996,7 +996,7 @@
184 wxFileOffset wxTarInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
185 {
186 if (!IsOpened()) {
187- wxLogError(_("tar entry not open"));
188+ wxLogError("%s", _("tar entry not open"));
189 m_lasterror = wxSTREAM_READ_ERROR;
190 }
191 if (!IsOk())
192@@ -1018,7 +1018,7 @@
193 size_t wxTarInputStream::OnSysRead(void *buffer, size_t size)
194 {
195 if (!IsOpened()) {
196- wxLogError(_("tar entry not open"));
197+ wxLogError("%s", _("tar entry not open"));
198 m_lasterror = wxSTREAM_READ_ERROR;
199 }
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;
208 }
209
210@@ -1371,7 +1371,7 @@
211 }
212
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;
217 return false;
218 }
219@@ -1492,7 +1492,7 @@
220 wxFileOffset wxTarOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
221 {
222 if (!IsOpened()) {
223- wxLogError(_("tar entry not open"));
224+ wxLogError("%s", _("tar entry not open"));
225 m_lasterror = wxSTREAM_WRITE_ERROR;
226 }
227 if (!IsOk() || m_datapos == wxInvalidOffset)
228@@ -1514,7 +1514,7 @@
229 size_t wxTarOutputStream::OnSysWrite(const void *buffer, size_t size)
230 {
231 if (!IsOpened()) {
232- wxLogError(_("tar entry not open"));
233+ wxLogError("%s", _("tar entry not open"));
234 m_lasterror = wxSTREAM_WRITE_ERROR;
235 }
236 if (!IsOk() || !size)
bdb99308
JB
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
239@@ -146,7 +146,7 @@
240 flags = wxZLIB_ZLIB;
241 }
242 else {
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;
246 return;
247 }
248@@ -173,7 +173,7 @@
249 }
250 }
251
252- wxLogError(_("Can't initialize zlib inflate stream."));
253+ wxLogError("%s", _("Can't initialize zlib inflate stream."));
254 m_lasterror = wxSTREAM_READ_ERROR;
255 }
256
257@@ -236,7 +236,7 @@
258 m_lasterror = wxSTREAM_EOF;
259 else
260 #endif
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."));
263 break;
264
265 default:
266@@ -299,7 +299,7 @@
267
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;
273 return;
274 }
275@@ -327,7 +327,7 @@
276 }
277 }
278
279- wxLogError(_("Can't initialize zlib deflate stream."));
280+ wxLogError("%s", _("Can't initialize zlib deflate stream."));
281 m_lasterror = wxSTREAM_WRITE_ERROR;
282 }
283
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
286@@ -525,7 +525,7 @@
287 m_parent_o_stream = &stream;
288
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;
293 return false;
294 }
295@@ -550,7 +550,7 @@
296 m_parent_i_stream = &stream;
297
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;
302 return false;
303 }
304@@ -1269,7 +1269,7 @@
305
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"));
310
311 return true;
312 }
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"));
319 return false;
320 }
321 else {
322@@ -1484,7 +1484,7 @@
323 return true;
324 }
325
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;
329 return false;
330 }
331@@ -1570,7 +1570,7 @@
332 return wxSTREAM_EOF;
333
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;
338 }
339
340@@ -1661,7 +1661,7 @@
341 }
342 }
343
344- wxLogError(_("error reading zip local header"));
345+ wxLogError("%s", _("error reading zip local header"));
346 return wxSTREAM_READ_ERROR;
347 }
348
349@@ -1709,7 +1709,7 @@
350 == wxInvalidOffset)
351 return false;
352 if (ReadSignature() != LOCAL_MAGIC) {
353- wxLogError(_("bad zipfile offset to entry"));
354+ wxLogError("%s", _("bad zipfile offset to entry"));
355 return false;
356 }
357 }
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"));
364 break;
365 }
366 m_store->Open(m_entry.GetSize());
367@@ -1790,7 +1790,7 @@
368 return m_inflate;
369
370 default:
371- wxLogError(_("unsupported Zip compression method"));
372+ wxLogError("%s", _("unsupported Zip compression method"));
373 }
374
375 return NULL;
376@@ -2171,7 +2171,7 @@
377 }
378
379 default:
380- wxLogError(_("unsupported Zip compression method"));
381+ wxLogError("%s", _("unsupported Zip compression method"));
382 }
383
384 return NULL;
0e6feeaf
JB
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
387@@ -44,7 +44,7 @@
388 {
389 if ( pipe(m_fds) == -1 )
390 {
391- wxLogSysError(_("Pipe creation failed"));
392+ wxLogSysError("%s", _("Pipe creation failed"));
393
394 return FALSE;
395 }
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
398@@ -75,7 +75,7 @@
399 int exitcode = 0;
400 if ( waitpid(execData.pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
401 {
402- wxLogSysError(_("Waiting for subprocess termination failed"));
403+ wxLogSysError("%s", _("Waiting for subprocess termination failed"));
404 }
405
406 return exitcode;
0606d3fc
JB
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
409@@ -267,7 +267,7 @@
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."));
415
416 return false;
417 }
418@@ -276,7 +276,7 @@
419 ssize_t count = file.Read(buf, WXSIZEOF(buf));
420 if ( count == wxInvalidOffset )
421 {
422- wxLogError(_("Failed to read PID from lock file."));
423+ wxLogError("%s", _("Failed to read PID from lock file."));
424 }
425 else
426 {
81a9b85a
JB
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
429@@ -729,7 +729,7 @@
430 int rc = pthread_setspecific(gs_keySelf, thread);
431 if ( rc != 0 )
432 {
433- wxLogSysError(rc, _("Cannot start thread: error writing TLS"));
434+ wxLogSysError(rc, "%s", _("Cannot start thread: error writing TLS"));
435
436 return (void *)-1;
437 }
438@@ -907,7 +907,7 @@
439 // wxLogDebug: it is possible to bring the system to its knees
440 // by creating too many threads and not joining them quite
441 // easily
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"));
444 }
445
446 m_shouldBeJoined = false;
447@@ -1106,7 +1106,7 @@
448 int policy;
449 if ( pthread_attr_getschedpolicy(&attr, &policy) != 0 )
450 {
451- wxLogError(_("Cannot retrieve thread scheduling policy."));
452+ wxLogError("%s", _("Cannot retrieve thread scheduling policy."));
453 }
454
455 #ifdef __VMS__
456@@ -1133,7 +1133,7 @@
457 if ( prio != WXTHREAD_DEFAULT_PRIORITY )
458 {
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."));
462 }
463 //else: we have default priority, so don't complain
464
465@@ -1433,7 +1433,7 @@
466 if ( pthread_cancel(m_internal->GetId()) != 0 )
467 #endif // HAVE_PTHREAD_CANCEL
468 {
469- wxLogError(_("Failed to terminate a thread."));
470+ wxLogError("%s", _("Failed to terminate a thread."));
471
472 return wxTHREAD_MISC_ERROR;
473 }
474@@ -1615,7 +1615,7 @@
475 int rc = pthread_key_create(&gs_keySelf, NULL /* dtor function */);
476 if ( rc != 0 )
477 {
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"));
480
481 return false;
482 }
feef0db8
JB
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
485@@ -628,7 +628,7 @@
486 if ( !sockSrv->WaitForAccept() )
487 {
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."));
491 delete sock;
492 sock = NULL;
493 }
494@@ -689,7 +689,7 @@
495 {
496 m_lastError = wxPROTO_PROTERR;
497 delete sockSrv;
498- wxLogError(_("The FTP server doesn't support the PORT command."));
499+ wxLogError("%s", _("The FTP server doesn't support the PORT command."));
500 return NULL;
501 }
502
503@@ -701,7 +701,7 @@
504 {
505 if ( !DoSimpleCommand(_T("PASV")) )
506 {
507- wxLogError(_("The FTP server doesn't support passive mode."));
508+ wxLogError("%s", _("The FTP server doesn't support passive mode."));
509 return NULL;
510 }
511
fb5aa3ae
JB
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
514@@ -432,7 +432,7 @@
515 switch ( select(fd + 1, &readfds, NULL, NULL, &tv) )
516 {
517 case -1:
518- wxLogSysError(_("Impossible to get child process input"));
519+ wxLogSysError("%s", _("Impossible to get child process input"));
520 // fall through
521
522 case 0:
523@@ -543,7 +543,7 @@
524 #endif
525 if ( pid == -1 ) // error?
526 {
527- wxLogSysError( _("Fork failed") );
528+ wxLogSysError("%s", _("Fork failed") );
529
530 ARGS_CLEANUP;
531
532@@ -596,7 +596,7 @@
533 dup2(pipeOut[wxPipe::Write], STDOUT_FILENO) == -1 ||
534 dup2(pipeErr[wxPipe::Write], STDERR_FILENO) == -1 )
535 {
536- wxLogSysError(_("Failed to redirect child process input/output"));
537+ wxLogSysError("%s", _("Failed to redirect child process input/output"));
538 }
539
540 pipeIn.Close();
541@@ -806,7 +806,7 @@
542
543 if ( !ok )
544 {
545- wxLogSysError(_("Cannot get the hostname"));
546+ wxLogSysError("%s", _("Cannot get the hostname"));
547 }
548
549 return ok;
abcd1fc9
JB
550@@ -842,7 +842,7 @@
551 struct hostent *host = gethostbyname(wxSafeConvertWX2MB(buf));
552 if ( !host )
553 {
554- wxLogSysError(_("Cannot get the official hostname"));
555+ wxLogSysError("%s", _("Cannot get the official hostname"));
556
557 ok = false;
558 }
bec58ce9
JB
559--- wxWidgets-2.8.12/src/common/sckaddr.cpp.orig 2011-03-22 12:59:42.000000000 +0100
560+++ wxWidgets-2.8.12/src/common/sckaddr.cpp 2012-09-30 10:54:15.261618553 +0200
561@@ -141,7 +141,7 @@
562 // Some people are sometimes fool.
563 if (name.empty())
564 {
565- wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
566+ wxLogWarning("%s", _("Trying to solve a NULL hostname: giving up") );
567 return false;
568 }
569 m_origHostname = name;
This page took 0.134422 seconds and 4 git commands to generate.