Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 81847 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81847 | brian.curtin | 2010-06-08 16:15:06 -0500 (Tue, 08 Jun 2010) | 3 lines

  Move a variable declration outside of a loop to match what was
  done in r81843 for py3k.
........
This commit is contained in:
Brian Curtin 2010-06-08 21:17:16 +00:00
parent 856333605a
commit 46a955b45a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PC/_winreg.c
View File

@ -1105,6 +1105,7 @@ PyEnumValue(PyObject *self, PyObject *args)
long rc; long rc;
char *retValueBuf; char *retValueBuf;
char *retDataBuf; char *retDataBuf;
char *tmpBuf;
DWORD retValueSize, bufValueSize; DWORD retValueSize, bufValueSize;
DWORD retDataSize, bufDataSize; DWORD retDataSize, bufDataSize;
DWORD typ; DWORD typ;
@ -1136,7 +1137,6 @@ PyEnumValue(PyObject *self, PyObject *args)
} }
while (1) { while (1) {
char *tmp;
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
rc = RegEnumValue(hKey, rc = RegEnumValue(hKey,
index, index,
@ -1152,13 +1152,13 @@ PyEnumValue(PyObject *self, PyObject *args)
break; break;
bufDataSize *= 2; bufDataSize *= 2;
tmp = (char *)PyMem_Realloc(retDataBuf, bufDataSize); tmpBuf = (char *)PyMem_Realloc(retDataBuf, bufDataSize);
if (tmp == NULL) { if (tmpBuf == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
retVal = NULL; retVal = NULL;
goto fail; goto fail;
} }
retDataBuf = tmp; retDataBuf = tmpBuf;
retDataSize = bufDataSize; retDataSize = bufDataSize;
retValueSize = bufValueSize; retValueSize = bufValueSize;
} }