Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove hardcoded names from Trace* macros, use __FUNCTION__ instead

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@258452 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jdennis%redhat.com
2009-09-22 14:05:38 +00:00
parent 1c53881cc7
commit a227bd2394
4 changed files with 235 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mozilla/security/python/nss/src/py_nspr_common.h
View File

@@ -60,7 +60,7 @@ typedef int Py_ssize_t;
printf("%s\n", _msg); \
}
#define TraceMethodEnter(_name, _obj) \
#define TraceMethodEnter(_obj) \
{ \
PyObject *repr = NULL; \
char *repr_str = NULL; \
@@ -69,11 +69,11 @@ typedef int Py_ssize_t;
repr = _obj->ob_type->tp_repr((PyObject *)_obj); \
repr_str = PyString_AsString(repr); \
} \
printf("%s: %s\n", _name, repr_str); \
printf("%s: %s\n", __FUNCTION__, repr_str); \
Py_XDECREF(repr); \
}
#define TraceMethodLeave(_name, _obj) \
#define TraceMethodLeave(_obj) \
{ \
PyObject *repr = NULL; \
char *repr_str = NULL; \
@@ -82,35 +82,35 @@ typedef int Py_ssize_t;
repr = _obj->ob_type->tp_repr((PyObject *)_obj); \
repr_str = PyString_AsString(repr); \
} \
printf("%s: %s\n", _name, repr_str); \
printf("%s: %s\n", __FUNCTION__, repr_str); \
Py_XDECREF(repr); \
}
#define TraceObjNewEnter(_name, _tp) \
{ \
PyTypeObject *tp = _tp; \
if (tp != NULL) \
printf("%s %s\n", _name, tp->tp_name); \
else \
printf("%s\n", _name); \
#define TraceObjNewEnter(_tp) \
{ \
PyTypeObject *tp = _tp; \
if (tp != NULL) \
printf("%s %s\n", __FUNCTION__, tp->tp_name); \
else \
printf("%s\n", __FUNCTION__); \
}
#define TraceObjNewLeave(_name, _obj) \
#define TraceObjNewLeave(_obj) \
{ \
PyObject *repr = NULL; \
\
if ((repr = _obj->ob_type->tp_repr((PyObject *)_obj))) { \
printf("%s: returns %s\n", _name, PyString_AsString(repr)); \
printf("%s: returns %s\n", __FUNCTION__, PyString_AsString(repr)); \
Py_DECREF(repr); \
} \
}
#else
#define TraceMessage(_msg)
#define TraceMethodEnter(_name, _obj)
#define TraceMethodLeave(_name, _obj)
#define TraceObjNewEnter(_name, _tp)
#define TraceObjNewLeave(_name, _obj)
#define TraceMethodEnter(_obj)
#define TraceMethodLeave(_obj)
#define TraceObjNewEnter(_tp)
#define TraceObjNewLeave(_obj)
#endif

72
mozilla/security/python/nss/src/py_nspr_io.c
View File

@@ -298,14 +298,14 @@ NetworkAddress_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
NetworkAddress *self = NULL;
TraceObjNewEnter("NetworkAddress_new", type);
TraceObjNewEnter(type);
if ((self = (NetworkAddress *)type->tp_alloc(type, 0)) == NULL) return NULL;
memset(&self->addr, 0, sizeof(self->addr));
self->py_hostname = NULL;
self->py_hostentry = NULL;
TraceObjNewLeave("NetworkAddress_new", self);
TraceObjNewLeave(self);
return (PyObject *)self;
}
@@ -314,21 +314,21 @@ NetworkAddress_new_from_PRNetAddr(PRNetAddr *pr_netaddr)
{
NetworkAddress *self = NULL;
TraceObjNewEnter("NetworkAddress_new_from_PRNetAddr", NULL);
TraceObjNewEnter(NULL);
if ((self = (NetworkAddress *) NetworkAddressType.tp_new(&NetworkAddressType, NULL, NULL)) == NULL)
return NULL;
self->addr = *pr_netaddr;
TraceObjNewLeave("NetworkAddress_new_from_PRNetAddr", self);
TraceObjNewLeave(self);
return (PyObject *) self;
}
static void
NetworkAddress_dealloc(NetworkAddress* self)
{
TraceMethodEnter("NetworkAddress_dealloc", self);
TraceMethodEnter(self);
Py_XDECREF(self->py_hostname);
Py_XDECREF(self->py_hostentry);
@@ -392,7 +392,7 @@ NetworkAddress_init(NetworkAddress *self, PyObject *args, PyObject *kwds)
char *addr_str = NULL;
TraceMethodEnter("NetworkAddress_init", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Oi", kwlist, &addr, &port))
return -1;
@@ -658,13 +658,13 @@ HostEntry_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
HostEntry *self = NULL;
TraceObjNewEnter("HostEntry_new", type);
TraceObjNewEnter(type);
if ((self = (HostEntry *)type->tp_alloc(type, 0)) == NULL) return NULL;
memset(&self->entry, 0, sizeof(self->entry));
memset(&self->buffer, 0, sizeof(self->buffer));
TraceObjNewLeave("HostEntry_new", self);
TraceObjNewLeave(self);
return (PyObject *)self;
}
@@ -673,7 +673,7 @@ HostEntry_new_from_PRNetAddr(PRNetAddr *pr_netaddr)
{
HostEntry *self = NULL;
TraceObjNewEnter("HostEntry_new_from_PRNetAddr", NULL);
TraceObjNewEnter(NULL);
if ((self = (HostEntry *) HostEntryType.tp_new(&HostEntryType, NULL, NULL)) == NULL)
return NULL;
@@ -682,14 +682,14 @@ HostEntry_new_from_PRNetAddr(PRNetAddr *pr_netaddr)
return set_nspr_error(NULL);
}
TraceObjNewLeave("HostEntry_new_from_PRNetAddr", self);
TraceObjNewLeave(self);
return (PyObject *) self;
}
static void
HostEntry_dealloc(HostEntry* self)
{
TraceMethodEnter("HostEntry_dealloc", self);
TraceMethodEnter(self);
self->ob_type->tp_free((PyObject*)self);
}
@@ -712,7 +712,7 @@ HostEntry_init(HostEntry *self, PyObject *args)
{
PyObject *addr = NULL;
TraceMethodEnter("HostEntry_init", self);
TraceMethodEnter(self);
if (!PyArg_ParseTuple(args, "O", &addr))
return -1;
@@ -835,7 +835,7 @@ HostEntryType = {
static void
Socket_init_from_PRFileDesc(Socket *self, PRFileDesc *pr_socket, int family)
{
TraceMethodEnter("Socket_init_from_PRFileDesc", self);
TraceMethodEnter(self);
self->pr_socket = pr_socket;
self->family = family;
@@ -847,14 +847,14 @@ Socket_new_from_PRFileDesc(PRFileDesc *pr_socket, int family)
{
Socket *self = NULL;
TraceObjNewEnter("Socket_new_from_PRFileDesc", NULL);
TraceObjNewEnter(NULL);
if ((self = (Socket *) SocketType.tp_new(&SocketType, NULL, NULL)) == NULL)
return NULL;
Socket_init_from_PRFileDesc(self, pr_socket, family);
TraceObjNewLeave("Socket_new_from_PRFileDesc", self);
TraceObjNewLeave(self);
return (PyObject *) self;
}
@@ -1005,7 +1005,7 @@ Socket_set_socket_option(Socket *self, PyObject *args)
NetworkAddress *ifaddr = NULL;
PRSocketOptionData data;
TraceMethodEnter("Socket_set_socket_option", self);
TraceMethodEnter(self);
if ((py_option = PyTuple_GetItem(args, 0)) == NULL) {
PyErr_SetString(PyExc_TypeError, "set_socket_option: missing option argument");
@@ -1222,7 +1222,7 @@ Socket_get_socket_option(Socket *self, PyObject *args)
PyObject *ifaddr = NULL;
PRSocketOptionData data;
TraceMethodEnter("Socket_get_socket_option", self);
TraceMethodEnter(self);
if (!PyArg_ParseTuple(args, "i:get_socket_option", &option))
return NULL;
@@ -1342,7 +1342,7 @@ Socket_connect(Socket *self, PyObject *args, PyObject *kwds)
NetworkAddress *py_netaddr = NULL;
unsigned int timeout = PR_INTERVAL_NO_TIMEOUT;
TraceMethodEnter("Socket_connect", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!|I:connect", kwlist,
&NetworkAddressType, &py_netaddr, &timeout))
@@ -1396,7 +1396,7 @@ Socket_accept(Socket *self, PyObject *args, PyObject *kwds)
PRFileDesc *pr_socket = NULL;
PyObject *return_values = NULL;
TraceMethodEnter("Socket_accept", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|I:accept", kwlist,
&timeout))
@@ -1460,7 +1460,7 @@ Socket_accept_read(Socket *self, PyObject *args, PyObject *kwds)
/* FIXME: for consistency should use readahead buffering, but since this is the first read
* the readahead would be empty anyway */
TraceMethodEnter("Socket_accept_read", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "i|I:accept_read", kwlist,
&requested_amount, &timeout))
@@ -1527,7 +1527,7 @@ Socket_bind(Socket *self, PyObject *args)
{
NetworkAddress *py_netaddr = NULL;
TraceMethodEnter("Socket_bind", self);
TraceMethodEnter(self);
if (!PyArg_ParseTuple(args, "O!:bind", &NetworkAddressType, &py_netaddr))
return NULL;
@@ -1566,7 +1566,7 @@ Socket_listen(Socket *self, PyObject *args, PyObject *kwds)
static char *kwlist[] = {"backlog", NULL};
int backlog = 5;
TraceMethodEnter("Socket_listen", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|I:listen", kwlist, &backlog))
return NULL;
@@ -1600,7 +1600,7 @@ Socket_shutdown(Socket *self, PyObject *args, PyObject *kwds)
static char *kwlist[] = {"how", NULL};
int how = PR_SHUTDOWN_BOTH;
TraceMethodEnter("Socket_shutdown", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|I:shutdown", kwlist, &how))
return NULL;
@@ -1620,7 +1620,7 @@ Close the socket.\n\
static PyObject *
Socket_close(Socket *self, PyObject *args)
{
TraceMethodEnter("Socket_close", self);
TraceMethodEnter(self);
if (PR_Close(self->pr_socket) != PR_SUCCESS)
return set_nspr_error(NULL);
@@ -1663,7 +1663,7 @@ Socket_readline(Socket *self, PyObject *args, PyObject *kwds)
long read_len, space_available, amount_read, line_len;
PyObject *line = NULL;
TraceMethodEnter("Socket_readline", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|l:readline", kwlist, &size))
return NULL;
@@ -1752,7 +1752,7 @@ Socket_recv(Socket *self, PyObject *args, PyObject *kwds)
long read_len, amount_read, result_len;
char *dst = NULL;
TraceMethodEnter("Socket_recv", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "i|I:recv", kwlist,
&requested_amount, &timeout))
@@ -1830,7 +1830,7 @@ Socket_read(Socket *self, PyObject *args, PyObject *kwds)
PyObject *buf = NULL;
long read_len, space_available, amount_read;
TraceMethodEnter("Socket_read", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|l:read", kwlist, &requested_amount))
return NULL;
@@ -1898,7 +1898,7 @@ Socket_recv_from(Socket *self, PyObject *args, PyObject *kwds)
/* FIXME: for consistency should use readahead buffering, but since this is the first read
* the readahead would be empty anyway */
TraceMethodEnter("Socket_recv_from", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "iO!|I:recv_from", kwlist,
&requested_amount, &NetworkAddressType, &py_netaddr, &timeout))
@@ -1952,7 +1952,7 @@ Socket_send(Socket *self, PyObject *args, PyObject *kwds)
unsigned int timeout = PR_INTERVAL_NO_TIMEOUT;
int amount;
TraceMethodEnter("Socket_send", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "s#|I:send", kwlist,
&buf, &len, &timeout))
@@ -1995,7 +1995,7 @@ Socket_send_to(Socket *self, PyObject *args, PyObject *kwds)
unsigned int timeout = PR_INTERVAL_NO_TIMEOUT;
int amount;
TraceMethodEnter("Socket_send_to", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "s#O!|I:send_to", kwlist,
&buf, &len, &NetworkAddressType, &py_netaddr, &timeout))
@@ -2148,14 +2148,14 @@ the other and vice versa.\n\
");
static PyObject *
Socket_new_tcp_pair(Socket *unused_class, PyObject *args)
Socket_new_tcp_pair(Socket *self, PyObject *args)
{
PRFileDesc *socks[2];
PRNetAddr addr0, addr1;
PyObject *py_sock0 = NULL, *py_sock1 = NULL;
PyObject *return_value = NULL;
TraceMethodEnter("Socket_new_tcp_pair", self);
TraceMethodEnter(self);
if (PR_NewTCPSocketPair(socks) != PR_SUCCESS)
return set_nspr_error(NULL);
@@ -2354,7 +2354,7 @@ Socket_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
Socket *self;
TraceObjNewEnter("Socket_new", type);
TraceObjNewEnter(type);
if ((self = (Socket *)type->tp_alloc(type, 0)) == NULL) return NULL;
self->pr_socket = NULL;
@@ -2362,14 +2362,14 @@ Socket_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
self->py_netaddr = NULL;
INIT_READAHEAD(&self->readahead);
TraceObjNewLeave("Socket_new", self);
TraceObjNewLeave(self);
return (PyObject *)self;
}
static void
Socket_dealloc(Socket* self)
{
TraceMethodEnter("Socket_dealloc", self);
TraceMethodEnter(self);
Py_XDECREF(self->py_netaddr);
FREE_READAHEAD(&self->readahead);
@@ -2402,7 +2402,7 @@ Socket_init(Socket *self, PyObject *args, PyObject *kwds)
int desc_type = PR_DESC_SOCKET_TCP;
PRFileDesc *pr_socket = NULL;
TraceMethodEnter("Socket_init", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|ii", kwlist,
&family, &desc_type))

306
mozilla/security/python/nss/src/py_nss.c
View File

File diff suppressed because it is too large Load Diff

58
mozilla/security/python/nss/src/py_ssl.c
View File

@@ -59,14 +59,14 @@ NetworkAddress_new_from_PRNetAddr(PRNetAddr *pr_netaddr)
{
NetworkAddress *self = NULL;
TraceObjNewEnter("NetworkAddress_new_from_PRNetAddr", NULL);
TraceObjNewEnter(NULL);
if ((self = (NetworkAddress *) NetworkAddressType.tp_new(&NetworkAddressType, NULL, NULL)) == NULL)
return NULL;
self->addr = *pr_netaddr;
TraceObjNewLeave("NetworkAddress_new_from_PRNetAddr", self);
TraceObjNewLeave(self);
return (PyObject *) self;
}
@@ -75,14 +75,14 @@ SSLSocket_new_from_PRFileDesc(PRFileDesc *pr_socket, int family)
{
SSLSocket *self = NULL;
TraceObjNewEnter("SSLSocket_new_from_PRFileDesc", NULL);
TraceObjNewEnter(NULL);
if ((self = (SSLSocket *) SSLSocketType.tp_new(&SSLSocketType, NULL, NULL)) == NULL)
return NULL;
Socket_init_from_PRFileDesc((Socket *)self, pr_socket, family);
TraceObjNewLeave("SSLSocket_new_from_PRFileDesc", self);
TraceObjNewLeave(self);
return (PyObject *) self;
}
@@ -287,7 +287,7 @@ SSLSocket_set_ssl_option(SSLSocket *self, PyObject *args)
int option;
int value;
TraceMethodEnter("SSLSocket_set_ssl_option", self);
TraceMethodEnter(self);
/*
* Note, although most of the options are booleans, at least one
@@ -323,7 +323,7 @@ SSLSocket_get_ssl_option(SSLSocket *self, PyObject *args)
int option;
int value;
TraceMethodEnter("SSLSocket_get_ssl_option", self);
TraceMethodEnter(self);
if (!PyArg_ParseTuple(args, "i:get_ssl_option", &option)) {
return NULL;
@@ -371,7 +371,7 @@ SSLSocket_accept(SSLSocket *self, PyObject *args, PyObject *kwds)
PRFileDesc *pr_socket = NULL;
PyObject *return_value = NULL;
TraceMethodEnter("SSLSocket_accept", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|I:accept", kwlist,
&timeout))
@@ -550,7 +550,7 @@ SSLSocket_set_auth_certificate_callback(SSLSocket *self, PyObject *args)
PyObject *callback;
PyObject *callback_args = NULL;
TraceMethodEnter("SSLSocket_set_auth_certificate_callback", self);
TraceMethodEnter(self);
argc = PyTuple_Size(args);
@@ -767,7 +767,7 @@ SSLSocket_set_client_auth_data_callback(SSLSocket *self, PyObject *args)
PyObject *callback;
PyObject *callback_args = NULL;
TraceMethodEnter("SSLSocket_set_client_auth_data_callback", self);
TraceMethodEnter(self);
argc = PyTuple_Size(args);
@@ -873,7 +873,7 @@ SSLSocket_set_handshake_callback(SSLSocket *self, PyObject *args)
PyObject *callback;
PyObject *callback_args = NULL;
TraceMethodEnter("SSLSocket_set_handshake_callback", self);
TraceMethodEnter(self);
argc = PyTuple_Size(args);
@@ -916,7 +916,7 @@ PyDoc_STRVAR(SSLSocket_set_pkcs11_pin_arg_doc,
static PyObject *
SSLSocket_set_pkcs11_pin_arg(SSLSocket *self, PyObject *args)
{
TraceMethodEnter("SSLSocket_set_pkcs11_pin_arg", self);
TraceMethodEnter(self);
Py_XDECREF(self->pk11_pin_args);
Py_INCREF(args);
@@ -942,7 +942,7 @@ SSLSocket_get_pkcs11_pin_arg(SSLSocket *self, PyObject *args)
{
PyObject *pk11_pin_args = NULL;
TraceMethodEnter("SSLSocket_get_pkcs11_pin_arg", self);
TraceMethodEnter(self);
self->pk11_pin_args = args;
pk11_pin_args = SSL_RevealPinArg(self->pr_socket);
@@ -979,7 +979,7 @@ SSLSocket_config_secure_server(SSLSocket *self, PyObject *args)
PrivateKey *py_priv_key = NULL;
int kea = 0;
TraceMethodEnter("SSLSocket_config_secure_server", self);
TraceMethodEnter(self);
if (!PyArg_ParseTuple(args, "O!O!i:config_secure_server",
&CertificateType, &py_cert,
@@ -1059,7 +1059,7 @@ resume this SSL session.\n\
static PyObject *
SSLSocket_invalidate_session(SSLSocket *self, PyObject *args)
{
TraceMethodEnter("SSLSocket_invalidate_session", self);
TraceMethodEnter(self);
if (SSL_InvalidateSession(self->pr_socket) != SECSuccess)
return set_nspr_error(NULL);
@@ -1084,7 +1084,7 @@ SSLSocket_data_pending(SSLSocket *self, PyObject *args)
{
int data_pending = 0;
TraceMethodEnter("SSLSocket_data_pending", self);
TraceMethodEnter(self);
data_pending = SSL_DataPending(self->pr_socket);
return PyInt_FromLong(data_pending);
@@ -1147,7 +1147,7 @@ SSLSocket_get_security_status(SSLSocket *self, PyObject *args)
char *subject = NULL;
PyObject *return_value = NULL;
TraceMethodEnter("SSLSocket_get_security_status", self);
TraceMethodEnter(self);
if (SSL_SecurityStatus(self->pr_socket, &on, &cipher, &key_size,
&secret_key_size, &issuer, &subject) != SECSuccess) {
@@ -1179,7 +1179,7 @@ SSLSocket_get_session_id(SSLSocket *self, PyObject *args)
SECItem *sec_item = NULL;
PyObject *return_value = NULL;
TraceMethodEnter("SSLSocket_get_session_id", self);
TraceMethodEnter(self);
if ((sec_item = SSL_GetSessionID(self->pr_socket)) == NULL)
return set_nspr_error(NULL);
@@ -1249,7 +1249,7 @@ SSLSocket_set_sock_peer_id(SSLSocket *self, PyObject *args)
{
char *id = NULL;
TraceMethodEnter("SSLSocket_set_sock_peer_id", self);
TraceMethodEnter(self);
if (!PyArg_ParseTuple(args, "s:set_sock_peer_id"))
return NULL;
@@ -1286,7 +1286,7 @@ SSLSocket_set_cipher_pref(SSLSocket *self, PyObject *args)
int cipher;
int enabled;
TraceMethodEnter("SSLSocket_set_cipher_pref", self);
TraceMethodEnter(self);
if (!PyArg_ParseTuple(args, "ii:set_cipher_pref", &cipher, &enabled))
return NULL;
@@ -1314,7 +1314,7 @@ SSLSocket_get_cipher_pref(SSLSocket *self, PyObject *args)
int cipher;
int enabled;
TraceMethodEnter("SSLSocket_get_cipher_pref", self);
TraceMethodEnter(self);
if (!PyArg_ParseTuple(args, "i:get_cipher_pref", &cipher))
return NULL;
@@ -1351,7 +1351,7 @@ SSLSocket_set_hostname(SSLSocket *self, PyObject *args)
{
char *url = NULL;
TraceMethodEnter("SSLSocket_set_hostname", self);
TraceMethodEnter(self);
if (!PyArg_ParseTuple(args, "s:set_hostname", &url))
return NULL;
@@ -1377,7 +1377,7 @@ SSLSocket_get_hostname(SSLSocket *self, PyObject *args)
char *url = NULL;
PyObject *py_hostname = NULL;
TraceMethodEnter("SSLSocket_get_hostname", self);
TraceMethodEnter(self);
if ((url = SSL_RevealURL(self->pr_socket)) == NULL)
return set_nspr_error(NULL);
@@ -1442,7 +1442,7 @@ SSLSocket_reset_handshake(SSLSocket *self, PyObject *args)
{
int as_server = 0;
TraceMethodEnter("SSLSocket_reset_handshake", self);
TraceMethodEnter(self);
if (!PyArg_ParseTuple(args, "i:reset_handshake", &as_server))
return NULL;
@@ -1689,7 +1689,7 @@ SSLSocket_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
SSLSocket *self;
TraceObjNewEnter("SSLSocket_new", type);
TraceObjNewEnter(type);
if ((self = (SSLSocket *)SocketType.tp_new(type, args, kwds)) == NULL)
return NULL;
@@ -1702,7 +1702,7 @@ SSLSocket_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
self->client_auth_data_callback = NULL;
self->client_auth_data_callback_data = NULL;
TraceObjNewLeave("SSLSocket_new", self);
TraceObjNewLeave(self);
return (PyObject *)self;
}
@@ -1710,7 +1710,7 @@ static void
SSLSocket_dealloc(SSLSocket* self)
{
TraceMethodEnter("SSLSocket_dealloc", self);
TraceMethodEnter(self);
Py_XDECREF(self->auth_certificate_callback);
Py_XDECREF(self->auth_certificate_callback_data);
@@ -1746,7 +1746,7 @@ SSLSocket_init(SSLSocket *self, PyObject *args, PyObject *kwds)
{
PRFileDesc *ssl_socket = NULL;
TraceMethodEnter("SSLSocket_init", self);
TraceMethodEnter(self);
if (SocketType.tp_init((PyObject *)self, args, kwds) < 0)
return -1;
@@ -1757,7 +1757,7 @@ SSLSocket_init(SSLSocket *self, PyObject *args, PyObject *kwds)
}
assert(self->pr_socket == ssl_socket);
TraceMethodLeave("SSLSocket_init", self);
TraceMethodLeave(self);
return 0;
}
@@ -2136,7 +2136,7 @@ SSL_config_server_session_id_cache(PyObject *self, PyObject *args, PyObject *kwd
PRUint32 ssl3_timeout = 0;
char *directory = NULL;
TraceMethodEnter("config_server_session_id_cache", self);
TraceMethodEnter(self);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|iIIz:config_server_session_id_cache", kwlist,
&max_cache_entries, &ssl2_timeout, &ssl3_timeout, &directory))