diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2020-01-19 10:41:22 +0000 |
|---|---|---|
| committer | Andy Fiddaman <omnios@citrus-it.co.uk> | 2020-01-21 15:17:45 +0000 |
| commit | dbce3eaafc7c3dceff97b7ab4de9308eb77f5795 (patch) | |
| tree | 759e65aac041c7ed62a8c1d23d3426f80b09ff6e /usr/src | |
| parent | 9841a15cbf9e40fb0b20da8312543d7ebd941848 (diff) | |
| download | illumos-joyent-dbce3eaafc7c3dceff97b7ab4de9308eb77f5795.tar.gz | |
12215 pyzfs module does not build with python 3.7
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Paul Winder <paul@winders.demon.co.uk>
Reviewed by: Alexander Pyhalov <apyhalov@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/pyzfs/common/ioctl.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr/src/lib/pyzfs/common/ioctl.c b/usr/src/lib/pyzfs/common/ioctl.c index a931a7bb69..c6d8d32b9a 100644 --- a/usr/src/lib/pyzfs/common/ioctl.c +++ b/usr/src/lib/pyzfs/common/ioctl.c @@ -143,10 +143,11 @@ dict2nvl(PyObject *d) assert(err == 0); while (PyDict_Next(d, &pos, &key, &value)) { + const char *keystr; #if PY_MAJOR_VERSION >= 3 - char *keystr = PyUnicode_AsUTF8(key); + keystr = PyUnicode_AsUTF8(key); #else - char *keystr = PyString_AsString(key); + keystr = PyString_AsString(key); #endif if (keystr == NULL) { PyErr_SetObject(PyExc_KeyError, key); @@ -165,10 +166,11 @@ dict2nvl(PyObject *d) #else } else if (PyString_Check(value)) { #endif + const char *valstr; #if PY_MAJOR_VERSION >= 3 - char *valstr = PyUnicode_AsUTF8(value); + valstr = PyUnicode_AsUTF8(value); #else - char *valstr = PyString_AsString(value); + valstr = PyString_AsString(value); #endif err = nvlist_add_string(nvl, keystr, valstr); } else if (PyLong_Check(value)) { |