]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-9566: Fix some library warnings
authorSegev Finer <segev208@gmail.com>
Thu, 29 Jun 2017 18:54:02 +0000 (21:54 +0300)
committerSegev Finer <segev208@gmail.com>
Thu, 29 Jun 2017 18:54:02 +0000 (21:54 +0300)
Modules/binascii.c
Modules/zlibmodule.c
PC/winreg.c

index 1f9ff5a57b459621d494ac10d89c0259db29a29c..1af6b7f98f255ff903e44824421a7c3a1b489846 100644 (file)
@@ -372,7 +372,7 @@ binascii_b2a_uu_impl(PyObject *module, Py_buffer *data, int backtick)
     if (backtick && !bin_len)
         *ascii_data++ = '`';
     else
-        *ascii_data++ = ' ' + bin_len;
+        *ascii_data++ = ' ' + (unsigned char)bin_len;
 
     for( ; bin_len > 0 || leftbits != 0 ; bin_len--, bin_data++ ) {
         /* Shift the data (or padding) into our buffer */
index cfe7f88dc540ecb1edb4aa6b145af5075efa7dce..32dd817434709ca7d410e34084ea01d5856a6ea9 100644 (file)
@@ -142,7 +142,7 @@ PyZlib_Free(voidpf ctx, void *ptr)
 static void
 arrange_input_buffer(z_stream *zst, Py_ssize_t *remains)
 {
-    zst->avail_in = Py_MIN((size_t)*remains, UINT_MAX);
+    zst->avail_in = (uInt)Py_MIN((size_t)*remains, UINT_MAX);
     *remains -= zst->avail_in;
 }
 
@@ -177,7 +177,7 @@ arrange_output_buffer_with_maximum(z_stream *zst, PyObject **buffer,
         }
     }
 
-    zst->avail_out = Py_MIN((size_t)(length - occupied), UINT_MAX);
+    zst->avail_out = (uInt)Py_MIN((size_t)(length - occupied), UINT_MAX);
     zst->next_out = (Byte *)PyBytes_AS_STRING(*buffer) + occupied;
 
     return length;
index 5efdc5e0efec6c8aed78434bdb7b9297e887c41d..2d665f73186efa240ed3c5a9b755f0db5f658952 100644 (file)
@@ -905,7 +905,7 @@ winreg_CreateKeyEx_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key,
     HKEY retKey;
     long rc;
 
-    rc = RegCreateKeyExW(key, sub_key, reserved, NULL, (DWORD)NULL,
+    rc = RegCreateKeyExW(key, sub_key, reserved, NULL, 0,
                          access, NULL, &retKey, NULL);
     if (rc != ERROR_SUCCESS) {
         PyErr_SetFromWindowsErrWithFunction(rc, "CreateKeyEx");