1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- src/application/pythonscript.cpp.orig 2004-11-28 14:35:24.000000000 +0100
+++ src/application/pythonscript.cpp 2008-08-03 17:12:45.000000000 +0200
@@ -99,14 +99,14 @@
if ( !(py_traceback=cStringIO->cgetvalue(catch_stderr)) )
throw ApplicationError("unable to get traceback","PythonScript::run()");
- int length;
+ Py_ssize_t length;
char *traceback;
if (PyString_AsStringAndSize(py_traceback, &traceback, &length))
throw ApplicationError("unable to convert traceback to char*","PythonScript::run()");
error << prefix() << "A python error occured. See traceback below." << endl;
error << prefix(false) << "Python traceback: ";
- for (int i=0;i<length-1;i++) {
+ for (Py_ssize_t i=0;i<length-1;i++) {
error << traceback[i];
if (traceback[i]=='\n')
error << prefix(false) << "Traceback: ";
--- src/application/idlescript.cpp.orig 2004-11-28 14:35:24.000000000 +0100
+++ src/application/idlescript.cpp 2008-08-03 17:13:55.000000000 +0200
@@ -28,6 +28,7 @@
IdleScript *instance=static_cast<IdleScript*>(arg);
instance->run();
pthread_cleanup_pop(1); // run the cleanup_handler and then deregister it
+ return NULL;
}
void idlescript_cleanup_handler(void* arg)
--- src/application/incomingscript.cpp.orig 2004-11-28 14:35:24.000000000 +0100
+++ src/application/incomingscript.cpp 2008-08-03 17:14:36.000000000 +0200
@@ -31,6 +31,7 @@
IncomingScript *instance=static_cast<IncomingScript*>(arg);
instance->run();
pthread_cleanup_pop(1); // run the cleanup_handler and then deregister it
+ return NULL;
}
void incomingscript_cleanup_handler(void* arg)
--- src/backend/capi.cpp.orig 2008-08-03 17:10:41.000000000 +0200
+++ src/backend/capi.cpp 2008-08-03 17:21:37.000000000 +0200
@@ -30,6 +30,7 @@
Capi *instance=static_cast<Capi*>(arg);
instance->run();
+ return NULL;
}
Capi::Capi (ostream& debug, unsigned short debug_level, ostream &error, unsigned short DDILength, unsigned short DDIBaseLength, vector<string> DDIStopNumbers, unsigned maxLogicalConnection, unsigned maxBDataBlocks,unsigned maxBDataLen) throw (CapiError, CapiMsgError)
|
GitWeb
