Merged revisions 81843 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r81843 | brian.curtin | 2010-06-08 15:57:52 -0500 (Tue, 08 Jun 2010) | 3 lines

  Fix a compile warning missed during porting (wchar_t/char) and move a
  variable declaration outside of a loop. #2810 was when this first went in.
........

diff --git a/PC/winreg.c b/PC/winreg.c
index c321d9f48d6939463a7ae5aab35deed5e7be7eb3..52d230e7b985cf55774b2e4ef67bd6e98b4741c2 100644 (file)
--- a/PC/winreg.c
+++ b/PC/winreg.c
@@ -1036,6 +1036,7 @@ PyEnumValue(PyObject *self, PyObject *args)
     int index;
     long rc;
     wchar_t *retValueBuf;
+    wchar_t *tmpBuf;
     BYTE *retDataBuf;
     DWORD retValueSize, bufValueSize;
     DWORD retDataSize, bufDataSize;
@@ -1068,7 +1069,6 @@ PyEnumValue(PyObject *self, PyObject *args)
     }
 
     while (1) {
-        wchar_t *tmp;
         Py_BEGIN_ALLOW_THREADS
         rc = RegEnumValueW(hKey,
                   index,
@@ -1084,13 +1084,13 @@ PyEnumValue(PyObject *self, PyObject *args)
             break;
 
         bufDataSize *= 2;
-        tmp = (char *)PyMem_Realloc(retDataBuf, bufDataSize);
-        if (tmp == NULL) {
+        tmpBuf = (wchar_t *)PyMem_Realloc(retDataBuf, bufDataSize);
+        if (tmpBuf == NULL) {
             PyErr_NoMemory();
             retVal = NULL;
             goto fail;
         }
-        retDataBuf = tmp;
+        retDataBuf = tmpBuf;
         retDataSize = bufDataSize;
         retValueSize = bufValueSize;
     }