]>
Commit | Line | Data |
---|---|---|
d5f32c29 JR |
1 | --- Ice-3.4.2/py/modules/IcePy/Operation.cpp.orig 2012-11-19 01:04:19.920721630 +0100 |
2 | +++ Ice-3.4.2/py/modules/IcePy/Operation.cpp 2012-11-19 01:05:20.854052813 +0100 | |
3 | @@ -1872,7 +1872,7 @@ | |
4 | // IllegalArgumentException can propagate directly. | |
5 | // (Raised by checkAsyncTwowayOnly) | |
6 | // | |
7 | - PyErr_Format(PyExc_RuntimeError, STRCAST(ex.reason().c_str())); | |
8 | + PyErr_Format(PyExc_RuntimeError, "%s", STRCAST(ex.reason().c_str())); | |
9 | return 0; | |
10 | } | |
11 | catch(const Ice::Exception&) | |
12 | @@ -1957,7 +1957,7 @@ | |
13 | } | |
14 | catch(const IceUtil::IllegalArgumentException& ex) | |
15 | { | |
16 | - PyErr_Format(PyExc_RuntimeError, STRCAST(ex.reason().c_str())); | |
17 | + PyErr_Format(PyExc_RuntimeError, "%s", STRCAST(ex.reason().c_str())); | |
18 | } | |
19 | catch(const Ice::Exception& ex) | |
20 | { | |
21 | @@ -2604,7 +2604,7 @@ | |
22 | } | |
23 | catch(const IceUtil::IllegalArgumentException& ex) | |
24 | { | |
25 | - PyErr_Format(PyExc_RuntimeError, STRCAST(ex.reason().c_str())); | |
26 | + PyErr_Format(PyExc_RuntimeError, "%s", STRCAST(ex.reason().c_str())); | |
27 | } | |
28 | catch(const Ice::Exception& ex) | |
29 | { | |
30 | --- Ice-3.4.2/rb/src/IceRuby/Operation.cpp~ 2011-06-15 21:44:00.000000000 +0200 | |
31 | +++ Ice-3.4.2/rb/src/IceRuby/Operation.cpp 2012-11-19 01:14:40.380699743 +0100 | |
32 | @@ -240,7 +240,7 @@ | |
33 | ||
34 | if(!_deprecateMessage.empty()) | |
35 | { | |
36 | - rb_warning(_deprecateMessage.c_str()); | |
37 | + rb_warning("%s", _deprecateMessage.c_str()); | |
38 | _deprecateMessage.clear(); // Only show the warning once. | |
39 | } | |
40 |