From: Brian Curtin Date: Tue, 8 Jun 2010 20:57:52 +0000 (+0000) Subject: Fix a compile warning missed during porting (wchar_t/char) and move a X-Git-Tag: v3.2a1~594 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b7e2d1e542ccecd031818229773d7836c437992;p=python 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 8f89a00333..c134a352e0 100644 --- a/PC/winreg.c +++ b/PC/winreg.c @@ -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; }