From c4edc066e93e9e9af80912c68989e5c5a1e9f1be Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 6 Nov 2018 16:20:56 -0500 Subject: [PATCH] Fix more compiler warnings (Issue #5423) --- cups/ppd-cache.c | 2 +- cups/tls-gnutls.c | 2 +- scheduler/ipp.c | 2 +- test/ipptool.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c index babb6aded9..e4af7b6447 100644 --- a/cups/ppd-cache.c +++ b/cups/ppd-cache.c @@ -3964,7 +3964,7 @@ _ppdCreateFromIPP(char *buffer, /* I - Filename buffer */ if (tray_len >= (int)sizeof(tray)) tray_len = (int)sizeof(tray) - 1; - memcpy(tray, tray_ptr, tray_len); + memcpy(tray, tray_ptr, (size_t)tray_len); tray[tray_len] = '\0'; if (strstr(tray, "stackingorder=lastToFirst;")) diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c index 71125073ce..05ec8ec7f1 100644 --- a/cups/tls-gnutls.c +++ b/cups/tls-gnutls.c @@ -394,7 +394,7 @@ httpCredentialsAreValidForName( for (i = 0; i < count; i ++) { rserial_size = sizeof(rserial); - if (!gnutls_x509_crl_get_crt_serial(tls_crl, (unsigned)i, rserial, &rserial_size, NULL) && cserial_size == rserial_size && !memcmp(cserial, rserial, (int)rserial_size)) + if (!gnutls_x509_crl_get_crt_serial(tls_crl, (unsigned)i, rserial, &rserial_size, NULL) && cserial_size == rserial_size && !memcmp(cserial, rserial, rserial_size)) { result = 0; break; diff --git a/scheduler/ipp.c b/scheduler/ipp.c index b472112ee1..c771f77f80 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -5848,7 +5848,7 @@ create_subscriptions( { char temp[64]; /* Temporary string */ - memcpy(temp, user_data->values[0].unknown.data, user_data->values[0].unknown.length); + memcpy(temp, user_data->values[0].unknown.data, (size_t)user_data->values[0].unknown.length); temp[user_data->values[0].unknown.length] = '\0'; if (httpSeparateURI(HTTP_URI_CODING_ALL, temp, scheme, sizeof(scheme), userpass, sizeof(userpass), host, sizeof(host), &port, resource, sizeof(resource)) < HTTP_URI_OK) diff --git a/test/ipptool.c b/test/ipptool.c index cf919b3034..71a05cba93 100644 --- a/test/ipptool.c +++ b/test/ipptool.c @@ -873,7 +873,7 @@ copy_hex_string(char *buffer, /* I - String buffer */ if ((size_t)datalen > bufsize) datalen = (int)bufsize - 1; - memcpy(buffer, data, datalen); + memcpy(buffer, data, (size_t)datalen); buffer[datalen] = '\0'; } } @@ -4828,7 +4828,7 @@ with_value(_cups_testdata_t *data, /* I - Test data */ withlen = (int)strlen(value); - memcpy(withdata, value, withlen); + memcpy(withdata, value, (size_t)withlen); } for (i = 0; i < count; i ++) -- 2.47.3