From: Brian Curtin <brian.curtin@gmail.com>
Date: Tue, 8 Jun 2010 21:15:06 +0000 (+0000)
Subject: Move a variable declration outside of a loop to match what was
X-Git-Tag: v2.7rc2~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7afd31a9bef6e0498e8fce646a2d4e8e8576e87;p=thirdparty%2FPython%2Fcpython.git

Move a variable declration outside of a loop to match what was
done in r81843 for py3k.
---

diff --git a/PC/_winreg.c b/PC/_winreg.c
index d3c39f91eac9..445c3edd76e0 100644
--- a/PC/_winreg.c
+++ b/PC/_winreg.c
@@ -1187,6 +1187,7 @@ PyEnumValue(PyObject *self, PyObject *args)
     long rc;
     char *retValueBuf;
     char *retDataBuf;
+    char *tmpBuf;
     DWORD retValueSize, bufValueSize;
     DWORD retDataSize, bufDataSize;
     DWORD typ;
@@ -1218,7 +1219,6 @@ PyEnumValue(PyObject *self, PyObject *args)
     }
 
     while (1) {
-        char *tmp;
         Py_BEGIN_ALLOW_THREADS
         rc = RegEnumValue(hKey,
                   index,
@@ -1234,13 +1234,13 @@ PyEnumValue(PyObject *self, PyObject *args)
             break;
 
         bufDataSize *= 2;
-        tmp = (char *)PyMem_Realloc(retDataBuf, bufDataSize);
-        if (tmp == NULL) {
+        tmpBuf = (char *)PyMem_Realloc(retDataBuf, bufDataSize);
+        if (tmpBuf == NULL) {
             PyErr_NoMemory();
             retVal = NULL;
             goto fail;
         }
-        retDataBuf = tmp;
+        retDataBuf = tmpBuf;
         retDataSize = bufDataSize;
         retValueSize = bufValueSize;
     }