Merge changes from CUPS 1.4svn-r7994.

[thirdparty/cups.git] / cups / ipp-private.h

diff --git a/cups/ipp-private.h b/cups/ipp-private.h
index 3b3455fe7949c4473a0d1b6f6e5a4cc423b5bb79..146b51eeffae78673dddb4edb90e4de75aa541ad 100644 (file)
--- a/cups/ipp-private.h
+++ b/cups/ipp-private.h
@@ -1,25 +1,16 @@
 /*
- * "$Id: ipp-private.h 5753 2006-07-18 19:53:24Z mike $"
+ * "$Id: ipp-private.h 7259 2008-01-28 22:26:04Z mike $"
  *
  *   Private IPP definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1997-2006 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.
  */
@@ -43,12 +34,28 @@ extern "C" {
 #  endif /* __cplusplus */
 
 
+/*
+ * Constants...
+ */
+
+#  define IPP_BUF_SIZE (IPP_MAX_LENGTH + 2)
+                                       /* Size of buffer */
+
+
 /*
  * Structures...
  */
 
+typedef struct _ipp_buffer_s           /**** Read/write buffer ****/
+{
+  unsigned char                d[IPP_BUF_SIZE];/* Data buffer */
+  struct _ipp_buffer_s *next;          /* Next buffer in list */
+  int                  used;           /* Is this buffer used? */
+} _ipp_buffer_t;
+
 typedef struct                         /**** Attribute mapping data ****/
 {
+  int          multivalue;             /* Option has multiple values? */
   const char   *name;                  /* Option/attribute name */
   ipp_tag_t    value_tag;              /* Value tag for this attribute */
   ipp_tag_t    group_tag;              /* Group tag for this attribute */
@@ -74,5 +81,5 @@ extern void           _ippFreeAttr(ipp_attribute_t *);
 #endif /* !_CUPS_IPP_H_ */
 
 /*
- * End of "$Id: ipp-private.h 5753 2006-07-18 19:53:24Z mike $".
+ * End of "$Id: ipp-private.h 7259 2008-01-28 22:26:04Z mike $".
  */