From d3454c3ef63898edb0ecb4c2b0e843a18ba607a4 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 25 Feb 2019 11:39:09 -0500 Subject: [PATCH] Fix compiler warning from newer GCC (Issue #5533) --- CHANGES.md | 3 ++- ppdc/ppdc-array.cxx | 6 +++--- ppdc/ppdc.h | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 3871ee38a..e814b4165 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -CHANGES - 2.3b8 - 2019-02-21 +CHANGES - 2.3b8 - 2019-02-25 ============================ @@ -31,6 +31,7 @@ Changes in CUPS v2.3b8 - Added a USB quirks rule for Xerox printers (Issue #5523) - The scheduler's self-signed certificate did not include all of the alternate names for the server when using GNU TLS (Issue #5525) +- Fixed a compiler warning with newer versions of GCC (Issue #5533) - Localization updates (Issue #5461, Issues #5471, Issue #5481, Issue #5486, Issue #5489, Issue #5491, Issue #5492, Issue #5493, Issue #5494, Issue #5495, Issue #5497, Issue #5499, Issue #5500, Issue #5501, Issue #5504) diff --git a/ppdc/ppdc-array.cxx b/ppdc/ppdc-array.cxx index bfc1dcf95..fac8f0a29 100644 --- a/ppdc/ppdc-array.cxx +++ b/ppdc/ppdc-array.cxx @@ -1,7 +1,7 @@ // // Array class for the CUPS PPD Compiler. // -// Copyright 2007-2014 by Apple Inc. +// Copyright 2007-2019 by Apple Inc. // Copyright 2002-2005 by Easy Software Products. // // Licensed under Apache License v2.0. See the file "LICENSE" for more information. @@ -60,7 +60,7 @@ ppdcArray::~ppdcArray() { PPDC_DELETE; - for (int i = 0; i < count; i ++) + for (size_t i = 0; i < count; i ++) data[i]->release(); if (alloc) @@ -130,7 +130,7 @@ ppdcArray::next() void ppdcArray::remove(ppdcShared *d) // I - Data element { - int i; // Looping var + size_t i; // Looping var for (i = 0; i < count; i ++) diff --git a/ppdc/ppdc.h b/ppdc/ppdc.h index a4d16ab23..075cdcb50 100644 --- a/ppdc/ppdc.h +++ b/ppdc/ppdc.h @@ -1,7 +1,7 @@ // // Definitions for the CUPS PPD Compiler. // -// Copyright 2007-2009 by Apple Inc. +// Copyright 2007-2019 by Apple Inc. // Copyright 2002-2007 by Easy Software Products. // // Licensed under Apache License v2.0. See the file "LICENSE" for more information. @@ -105,7 +105,7 @@ class ppdcArray //// Shared Array { public: - int count, // Number of elements + size_t count, // Number of elements alloc, // Allocated elements current; // Current element ppdcShared **data; // Elements -- 2.39.2