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.
This commit is contained in:
Brian Curtin 2010-06-08 20:57:52 +00:00
parent ecccc4f9b8
commit 9b7e2d1e54

View file

@ -1129,6 +1129,7 @@ PyEnumValue(PyObject *self, PyObject *args)
int index;
long rc;
wchar_t *retValueBuf;
wchar_t *tmpBuf;
BYTE *retDataBuf;
DWORD retValueSize, bufValueSize;
DWORD retDataSize, bufDataSize;
@ -1161,7 +1162,6 @@ PyEnumValue(PyObject *self, PyObject *args)
}
while (1) {
wchar_t *tmp;
Py_BEGIN_ALLOW_THREADS
rc = RegEnumValueW(hKey,
index,
@ -1177,13 +1177,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;
}