Load cups into easysw/current.

[thirdparty/cups.git] / cups / array.h

diff --git a/cups/array.h b/cups/array.h
index 3c7509237f4ab1a6cc38239a062fac23826e821c..2d1b89f47fd5caecea0e6d4257d00cac07acedf6 100644 (file)
--- a/cups/array.h
+++ b/cups/array.h
@@ -1,25 +1,16 @@
 /*
- * "$Id: array.h 4970 2006-01-24 14:05:45Z mike $"
+ * "$Id: array.h 6649 2007-07-11 21:46:42Z mike $"
  *
  *   Sorted array definitions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */
@@ -51,6 +42,9 @@ typedef struct _cups_array_s cups_array_t;
                                        /**** CUPS array type ****/
 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 ****/
+
 
 /*
  * Functions...
@@ -64,15 +58,20 @@ extern void         cupsArrayDelete(cups_array_t *a);
 extern cups_array_t    *cupsArrayDup(cups_array_t *a);
 extern void            *cupsArrayFind(cups_array_t *a, void *e);
 extern void            *cupsArrayFirst(cups_array_t *a);
+extern int             cupsArrayGetIndex(cups_array_t *a);
+extern int             cupsArrayGetInsert(cups_array_t *a);
 extern void            *cupsArrayIndex(cups_array_t *a, int n);
 extern int             cupsArrayInsert(cups_array_t *a, void *e);
 extern void            *cupsArrayLast(cups_array_t *a);
 extern cups_array_t    *cupsArrayNew(cups_array_func_t f, void *d);
+extern cups_array_t    *cupsArrayNew2(cups_array_func_t f, void *d,
+                                      cups_ahash_func_t h, int hsize);
 extern void            *cupsArrayNext(cups_array_t *a);
 extern void            *cupsArrayPrev(cups_array_t *a);
 extern int             cupsArrayRemove(cups_array_t *a, void *e);
 extern void            *cupsArrayRestore(cups_array_t *a);
 extern int             cupsArraySave(cups_array_t *a);
+extern void            *cupsArrayUserData(cups_array_t *a);
 
 #  ifdef __cplusplus
 }
@@ -80,5 +79,5 @@ extern int            cupsArraySave(cups_array_t *a);
 #endif /* !_CUPS_ARRAY_H_ */
 
 /*
- * End of "$Id: array.h 4970 2006-01-24 14:05:45Z mike $".
+ * End of "$Id: array.h 6649 2007-07-11 21:46:42Z mike $".
  */