diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-11-06 05:13:04 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-11-06 05:13:04 +0000 |
| commit | 10d09e334a4892cd5ed4e2a2a0f5bbe3c8c171ed (patch) | |
| tree | cb980415b72e93a966ea00d60a18ace75533dcfd /cups/array.h | |
| parent | 6c48a6cafc078a698d97c82c1dd69ac9f850c0ce (diff) | |
| download | cups-10d09e334a4892cd5ed4e2a2a0f5bbe3c8c171ed.tar.gz | |
Merge changes from CUPS 1.5svn-r9352.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2848 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/array.h')
| -rw-r--r-- | cups/array.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/cups/array.h b/cups/array.h index 029e2e996..466a2721f 100644 --- a/cups/array.h +++ b/cups/array.h @@ -1,9 +1,9 @@ /* * "$Id: array.h 7266 2008-01-29 02:15:29Z mike $" * - * Sorted array definitions for the Common UNIX Printing System (CUPS). + * Sorted array definitions for CUPS. * - * Copyright 2007-2008 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -45,6 +45,10 @@ typedef int (*cups_array_func_t)(void *first, void *second, void *data); /**** Array comparison function ****/ typedef int (*cups_ahash_func_t)(void *element, void *data); /**** Array hash function ****/ +typedef void *(*cups_acopy_func_t)(void *element, void *data); + /**** Array element copy function ****/ +typedef void (*cups_afree_func_t)(void *element, void *data); + /**** Array element free function ****/ /* @@ -67,6 +71,10 @@ extern void *cupsArrayLast(cups_array_t *a) _CUPS_API_1_2; extern cups_array_t *cupsArrayNew(cups_array_func_t f, void *d) _CUPS_API_1_2; extern cups_array_t *cupsArrayNew2(cups_array_func_t f, void *d, cups_ahash_func_t h, int hsize) _CUPS_API_1_3; +extern cups_array_t *cupsArrayNew3(cups_array_func_t f, void *d, + cups_ahash_func_t h, int hsize, + cups_acopy_func_t cf, + cups_afree_func_t ff) _CUPS_API_1_5; extern void *cupsArrayNext(cups_array_t *a) _CUPS_API_1_2; extern void *cupsArrayPrev(cups_array_t *a) _CUPS_API_1_2; extern int cupsArrayRemove(cups_array_t *a, void *e) _CUPS_API_1_2; |