Merge pull request #5410 from AOSC-Dev/master

[thirdparty/cups.git] / scheduler / printers.h

diff --git a/scheduler/printers.h b/scheduler/printers.h
index c63b4711f06cfe03817d52a61997bd3300ce8cb4..4959bf27606c7e2e382868016bea9064f970dbeb 100644 (file)
--- a/scheduler/printers.h
+++ b/scheduler/printers.h
@@ -1,14 +1,10 @@
 /*
  * Printer definitions for the CUPS scheduler.
  *
- * Copyright 2007-2016 by Apple Inc.
+ * Copyright 2007-2017 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
  */
 
 #ifdef HAVE_DNSSD
@@ -58,6 +54,7 @@ typedef struct cupsd_job_s cupsd_job_t;
 struct cupsd_printer_s
 {
   _cups_rwlock_t lock;                 /* Concurrency lock for background updates */
+  int          printer_id;             /* Printer ID */
   char         *uri,                   /* Printer URI */
                *uuid,                  /* Printer UUID */
                *hostname,              /* Host printer resides on */
@@ -68,6 +65,7 @@ struct cupsd_printer_s
                *info,                  /* Description */
                *organization,          /* Organization name */
                *organizational_unit,   /* Organizational unit (department, etc.) */
+               *strings,               /* Strings file, if any */
                *op_policy,             /* Operation policy name */
                *error_policy;          /* Error policy */
   cupsd_policy_t *op_policy_ptr;       /* Pointer to operation policy */
@@ -137,6 +135,8 @@ VAR ipp_t           *CommonData     VALUE(NULL);
                                        /* Common printer object attrs */
 VAR cups_array_t       *CommonDefaults VALUE(NULL);
                                        /* Common -default option names */
+VAR int                        NextPrinterId   VALUE(1);
+                                       /* Next printer-id value */
 VAR cups_array_t       *Printers       VALUE(NULL);
                                        /* Printer list */
 VAR cupsd_printer_t    *DefaultPrinter VALUE(NULL);
@@ -156,6 +156,7 @@ extern cupsd_printer_t      *cupsdAddPrinter(const char *name);
 extern void            cupsdCreateCommonData(void);
 extern void            cupsdDeleteAllPrinters(void);
 extern int             cupsdDeletePrinter(cupsd_printer_t *p, int update);
+extern void             cupsdDeleteTemporaryPrinters(int force);
 extern cupsd_printer_t *cupsdFindDest(const char *name);
 extern cupsd_printer_t *cupsdFindPrinter(const char *name);
 extern cupsd_quota_t   *cupsdFindQuota(cupsd_printer_t *p,