diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2014-02-06 18:33:34 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2014-02-06 18:33:34 +0000 |
commit | 7e86f2f686334cb3db458b4585dfce9c1b712bc4 (patch) | |
tree | 88b4a0536faefcada96437e7cddd3a36cfdee0a4 /ppdc/ppdc-array.cxx | |
parent | b1564baed9db112cb1334027f1d141877d88fcf4 (diff) |
Full sweep of all Clang warnings, plus some bug fixes for incorrect memcpy usage.
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11558 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'ppdc/ppdc-array.cxx')
-rw-r--r-- | ppdc/ppdc-array.cxx | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/ppdc/ppdc-array.cxx b/ppdc/ppdc-array.cxx index 33d8bf773..688f56c46 100644 --- a/ppdc/ppdc-array.cxx +++ b/ppdc/ppdc-array.cxx @@ -1,25 +1,16 @@ // // "$Id$" // -// Array class for the CUPS PPD Compiler. +// Array class for the CUPS PPD Compiler. // -// Copyright 2007-2009 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. +// Copyright 2007-2014 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcArray::ppdcArray() - Create a new array. -// ppdcArray::~ppdcArray() - Destroy an array. -// ppdcArray::add() - Add an element to an array. -// ppdcArray::first() - Return the first element in the array. -// ppdcArray::next() - Return the next element in the array. -// ppdcArray::remove() - Remove an element from the array. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -48,7 +39,7 @@ ppdcArray::ppdcArray(ppdcArray *a) // Make a copy of the array... data = new ppdcShared *[count]; - memcpy(data, a->data, count * sizeof(ppdcShared *)); + memcpy(data, a->data, (size_t)count * sizeof(ppdcShared *)); for (int i = 0; i < count; i ++) data[i]->retain(); @@ -98,7 +89,7 @@ ppdcArray::add(ppdcShared *d) alloc += 10; temp = new ppdcShared *[alloc]; - memcpy(temp, data, count * sizeof(ppdcShared *)); + memcpy(temp, data, (size_t)count * sizeof(ppdcShared *)); delete[] data; data = temp; @@ -159,7 +150,7 @@ ppdcArray::remove(ppdcShared *d) // I - Data element d->release(); if (i < count) - memmove(data + i, data + i + 1, (count - i) * sizeof(ppdcShared *)); + memmove(data + i, data + i + 1, (size_t)(count - i) * sizeof(ppdcShared *)); } |