_cupsEncodeOption should return the attribute that has been encoded.

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

diff --git a/cups/cups-private.h b/cups/cups-private.h
index 03cd8df7eb7f313e544f3274a37ee8292b14b829..27246dc9033a856ab3c21513fbc952437f4dc049 100644 (file)
--- a/cups/cups-private.h
+++ b/cups/cups-private.h
@@ -1,16 +1,11 @@
 /*
  * Private definitions for CUPS.
  *
- * Copyright 2007-2015 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
  *
- * 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/".
- *
- * This file is subject to the Apple OS-Developed Software exception.
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  */
 
 #ifndef _CUPS_CUPS_PRIVATE_H_
@@ -105,7 +100,7 @@ typedef struct _cups_globals_s              /**** CUPS global state data ****/
   int                  need_res_init;  /* Need to reinitialize resolver? */
 
   /* ipp.c */
-  ipp_uchar_t          ipp_date[11];   /* RFC-1903 date/time data */
+  ipp_uchar_t          ipp_date[11];   /* RFC-2579 date/time data */
   _cups_buffer_t       *cups_buffers;  /* Buffer list */
 
   /* ipp-support.c */
@@ -237,13 +232,10 @@ extern void               _cupsBufferRelease(char *b);
 
 extern http_t          *_cupsConnect(void);
 extern char            *_cupsCreateDest(const char *name, const char *info, const char *device_id, const char *device_uri, char *uri, size_t urisize);
-extern int             _cupsGet1284Values(const char *device_id,
-                                          cups_option_t **values);
-extern const char      *_cupsGetDestResource(cups_dest_t *dest, char *resource,
-                                             size_t resourcesize);
-extern int             _cupsGetDests(http_t *http, ipp_op_t op,
-                                     const char *name, cups_dest_t **dests,
-                                     cups_ptype_t type, cups_ptype_t mask);
+extern ipp_attribute_t *_cupsEncodeOption(ipp_t *ipp, ipp_tag_t group_tag, _ipp_option_t *map, const char *name, const char *value);
+extern int             _cupsGet1284Values(const char *device_id, cups_option_t **values);
+extern const char      *_cupsGetDestResource(cups_dest_t *dest, unsigned flags, char *resource, size_t resourcesize);
+extern int             _cupsGetDests(http_t *http, ipp_op_t op, const char *name, cups_dest_t **dests, cups_ptype_t type, cups_ptype_t mask);
 extern const char      *_cupsGetPassword(const char *prompt);
 extern void            _cupsGlobalLock(void);
 extern _cups_globals_t *_cupsGlobals(void);
@@ -253,13 +245,10 @@ extern const char *_cupsGSSServiceName(void);
 #  endif /* HAVE_GSSAPI */
 extern int             _cupsNextDelay(int current, int *previous);
 extern void            _cupsSetDefaults(void);
-extern void            _cupsSetError(ipp_status_t status, const char *message,
-                                     int localize);
+extern void            _cupsSetError(ipp_status_t status, const char *message, int localize);
 extern void            _cupsSetHTTPError(http_status_t status);
 #  ifdef HAVE_GSSAPI
-extern int             _cupsSetNegotiateAuthString(http_t *http,
-                                                   const char *method,
-                                                   const char *resource);
+extern int             _cupsSetNegotiateAuthString(http_t *http, const char *method, const char *resource);
 #  endif /* HAVE_GSSAPI */
 extern char            *_cupsUserDefault(char *name, size_t namesize);