From: Guido van Rossum <guido@python.org>
Date: Thu, 25 Oct 2001 18:07:22 +0000 (+0000)
Subject: complex_subtype_from_string(): move the declaration of s_buffer[] out
X-Git-Tag: v2.2.1c1~1058
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70e368836421a2e8c08dbd043a1540ad56d7ae5c;p=python

complex_subtype_from_string(): move the declaration of s_buffer[] out
of the if block where it was before.  The name is only used inside
that if block, but the storage is referenced outside it via the 's'
variable.

(This patch was part of SF patch #474590 -- RISC OS support.)
---

diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index 675d5b512a..68d842ea4f 100644
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -646,6 +646,9 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
 	int sw_error=0;
 	int sign;
 	char buffer[256]; /* For errors */
+#ifdef Py_USING_UNICODE
+	char s_buffer[256];
+#endif
 	int len;
 
 	if (PyString_Check(v)) {
@@ -654,7 +657,6 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
 	}
 #ifdef Py_USING_UNICODE
 	else if (PyUnicode_Check(v)) {
-	    	char s_buffer[256];
 		if (PyUnicode_GET_SIZE(v) >= sizeof(s_buffer)) {
 			PyErr_SetString(PyExc_ValueError,
 				 "complex() literal too large to convert");