From: Walter Dörwald <walter@livinglogic.de>
Date: Tue, 5 Jun 2007 13:49:43 +0000 (+0000)
Subject: Simplify os_init() implementations by using PyErr_Format()
X-Git-Tag: v3.0a1~835
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bbd8abe6b890e296141a4311b361f81af2e4b2c;p=thirdparty%2FPython%2Fcpython.git

Simplify os_init() implementations by using PyErr_Format()
directly instead of PyOS_snprintf()+PyErr_SetString().
---

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 207702320d30..94ddddaab055 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -4045,7 +4045,6 @@ os_init(void)
 {
 	WSADATA WSAData;
 	int ret;
-	char buf[100];
 	ret = WSAStartup(0x0101, &WSAData);
 	switch (ret) {
 	case 0:	/* No error */
@@ -4062,9 +4061,7 @@ os_init(void)
 			"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 @@ static int
 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