Mercurial > cpython-lru_cache-weakref
diff Modules/socketmodule.c @ 41943:8bcfc46e444b
Simplify os_init() implementations by using PyErr_Format()
directly instead of PyOS_snprintf()+PyErr_SetString().
| author | Walter Dörwald <walter@livinglogic.de> |
|---|---|
| date | Tue, 05 Jun 2007 13:49:43 +0000 |
| parents | 73dd2da31d37 |
| children | 229c28cb9afb |
line wrap: on
line diff
--- a/Modules/socketmodule.c Tue Jun 05 13:48:11 2007 +0000 +++ b/Modules/socketmodule.c Tue Jun 05 13:49:43 2007 +0000 @@ -4045,7 +4045,6 @@ { WSADATA WSAData; int ret; - char buf[100]; ret = WSAStartup(0x0101, &WSAData); switch (ret) { case 0: /* No error */ @@ -4062,9 +4061,7 @@ "WSAStartup failed: requested version not supported"); break; default: - PyOS_snprintf(buf, sizeof(buf), - "WSAStartup failed: error code %d", ret); - PyErr_SetString(PyExc_ImportError, buf); + PyErr_Format(PyExc_ImportError, "WSAStartup failed: error code %d", ret); break; } return 0; /* Failure */ @@ -4082,16 +4079,13 @@ os_init(void) { #ifndef PYCC_GCC - char reason[64]; int rc = sock_init(); if (rc == 0) { return 1; /* Success */ } - PyOS_snprintf(reason, sizeof(reason), - "OS/2 TCP/IP Error# %d", sock_errno()); - PyErr_SetString(PyExc_ImportError, reason); + PyErr_Format(PyExc_ImportError, "OS/2 TCP/IP Error# %d", sock_errno()); return 0; /* Failure */ #else