X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=blobdiff_plain;f=cups%2Fipp.h;h=29ef86afd37e38fff89f0f783fd8f884ebe5d131;hp=d4ae704ea0a46c718d135f57f52cb8203cc79203;hb=a41f09e265d6451d22585430ca176ff406d59f9b;hpb=f7deaa1a21758ec90bf23314af018481ea8aea7f

diff --git a/cups/ipp.h b/cups/ipp.h
index d4ae704ea..29ef86afd 100644
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -1,26 +1,17 @@
 /*
- * "$Id: ipp.h 5873 2006-08-24 14:37:24Z mike $"
+ * "$Id: ipp.h 6879 2007-08-29 20:26:50Z mike $"
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 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.
  */
@@ -64,7 +55,8 @@ extern "C" {
  * Common limits...
  */
 
-#  define IPP_MAX_NAME		256
+#  define IPP_MAX_LENGTH	32767	/* Maximum size of any single value */
+#  define IPP_MAX_NAME		256	/* Maximum length of common name values */
 #  define IPP_MAX_VALUES	8	/* Power-of-2 allocation increment */
 
 
@@ -254,7 +246,9 @@ typedef enum ipp_op_e			/**** IPP operations... ****/
   CUPS_GET_DEVICES,			/* Get a list of supported devices */
   CUPS_GET_PPDS,			/* Get a list of supported drivers */
   CUPS_MOVE_JOB,			/* Move a job to a different printer */
-  CUPS_AUTHENTICATE_JOB			/* Authenticate a job @since CUPS 1.2@ */
+  CUPS_AUTHENTICATE_JOB,		/* Authenticate a job @since CUPS 1.2@ */
+  CUPS_GET_PPD,				/* Get a PPD file @since CUPS 1.3@ */
+  CUPS_GET_DOCUMENT = 0x4027		/* Get a document file @since CUPS 1.4@ */
 } ipp_op_t;
 
 /* Old names for the operations */
@@ -271,7 +265,8 @@ typedef enum ipp_status_e		/**** IPP status codes... ****/
   IPP_OK_TOO_MANY_EVENTS,		/* successful-ok-too-many-events */
   IPP_OK_BUT_CANCEL_SUBSCRIPTION,	/* successful-ok-but-cancel-subscription */
   IPP_OK_EVENTS_COMPLETE,		/* successful-ok-events-complete */
-  IPP_REDIRECTION_OTHER_SITE = 0x300,	/*  */
+  IPP_REDIRECTION_OTHER_SITE = 0x200,	/*  */
+  CUPS_SEE_OTHER = 0x280,		/* cups-see-other */
   IPP_BAD_REQUEST = 0x0400,		/* client-error-bad-request */
   IPP_FORBIDDEN,			/* client-error-forbidden */
   IPP_NOT_AUTHENTICATED,		/* client-error-not-authenticated */
@@ -467,26 +462,26 @@ extern void		ippSetPort(int p);
 
 /**** New in CUPS 1.1.19 ****/
 extern ipp_attribute_t	*ippAddCollection(ipp_t *ipp, ipp_tag_t group,
-			                  const char *name, ipp_t *value);
+			                  const char *name, ipp_t *value) _CUPS_API_1_1_19;
 extern ipp_attribute_t	*ippAddCollections(ipp_t *ipp, ipp_tag_t group,
 			                   const char *name, int num_values,
-					   const ipp_t **values);
-extern void		ippDeleteAttribute(ipp_t *ipp, ipp_attribute_t *attr);
-extern ipp_state_t	ippReadFile(int fd, ipp_t *ipp);
-extern ipp_state_t	ippWriteFile(int fd, ipp_t *ipp);
+					   const ipp_t **values) _CUPS_API_1_1_19;
+extern void		ippDeleteAttribute(ipp_t *ipp, ipp_attribute_t *attr) _CUPS_API_1_1_19;
+extern ipp_state_t	ippReadFile(int fd, ipp_t *ipp) _CUPS_API_1_1_19;
+extern ipp_state_t	ippWriteFile(int fd, ipp_t *ipp) _CUPS_API_1_1_19;
 
 /**** New in CUPS 1.2 ****/
 extern ipp_attribute_t	*ippAddOctetString(ipp_t *ipp, ipp_tag_t group,
 			                   const char *name,
-					   const void *data, int datalen);
-extern ipp_status_t	ippErrorValue(const char *name);
-extern ipp_t		*ippNewRequest(ipp_op_t op);
-extern const char	*ippOpString(ipp_op_t op);
-extern ipp_op_t		ippOpValue(const char *name);
+					   const void *data, int datalen) _CUPS_API_1_2;
+extern ipp_status_t	ippErrorValue(const char *name) _CUPS_API_1_2;
+extern ipp_t		*ippNewRequest(ipp_op_t op) _CUPS_API_1_2;
+extern const char	*ippOpString(ipp_op_t op) _CUPS_API_1_2;
+extern ipp_op_t		ippOpValue(const char *name) _CUPS_API_1_2;
 extern ipp_state_t	ippReadIO(void *src, ipp_iocb_t cb, int blocking,
-			          ipp_t *parent, ipp_t *ipp);
+			          ipp_t *parent, ipp_t *ipp) _CUPS_API_1_2;
 extern ipp_state_t	ippWriteIO(void *dst, ipp_iocb_t cb, int blocking,
-			           ipp_t *parent, ipp_t *ipp);
+			           ipp_t *parent, ipp_t *ipp) _CUPS_API_1_2;
 
 
 /*
@@ -499,5 +494,5 @@ extern ipp_state_t	ippWriteIO(void *dst, ipp_iocb_t cb, int blocking,
 #endif /* !_CUPS_IPP_H_ */
 
 /*
- * End of "$Id: ipp.h 5873 2006-08-24 14:37:24Z mike $".
+ * End of "$Id: ipp.h 6879 2007-08-29 20:26:50Z mike $".
  */