Clean out some more _cupsStr cruft that might potentially cause an

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

diff --git a/scheduler/subscriptions.h b/scheduler/subscriptions.h
index 7f112fa0cb1ff087be557a714e67a8f88222d47e..9be5fe62f5bd69fabc89b1065f69dc7d99392885 100644 (file)
--- a/scheduler/subscriptions.h
+++ b/scheduler/subscriptions.h
@@ -1,16 +1,10 @@
 /*
- * "$Id: subscriptions.h 6649 2007-07-11 21:46:42Z mike $"
+ * Subscription definitions for the CUPS scheduler.
  *
- *   Subscription definitions for the Common UNIX Printing System (CUPS) scheduler.
+ * Copyright 2007-2010 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007 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/".
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
  */
 
 /*
@@ -80,7 +74,7 @@ typedef struct cupsd_event_s          /**** Event structure ****/
   ipp_t                        *attrs;         /* Notification message */
   cupsd_printer_t      *dest;          /* Associated printer, if any */
   cupsd_job_t          *job;           /* Associated job, if any */
-} cupsd_event_t; 
+} cupsd_event_t;
 
 typedef struct cupsd_subscription_s    /**** Subscription structure ****/
 {
@@ -100,9 +94,8 @@ typedef struct cupsd_subscription_s  /**** Subscription structure ****/
   time_t               last;           /* Time of last notification */
   time_t               expire;         /* Lease expiration time */
   int                  first_event_id, /* First event-id in cache */
-                       next_event_id,  /* Next event-id to use */
-                       num_events;     /* Number of cached events */
-  cupsd_event_t                **events;       /* Cached events */
+                       next_event_id;  /* Next event-id to use */
+  cups_array_t         *events;        /* Cached events */
 } cupsd_subscription_t;
 
 
@@ -160,8 +153,3 @@ extern void cupsdExpireSubscriptions(cupsd_printer_t *dest,
 extern void    cupsdLoadAllSubscriptions(void);
 extern void    cupsdSaveAllSubscriptions(void);
 extern void    cupsdStopAllNotifiers(void);
-
-
-/*
- * End of "$Id: subscriptions.h 6649 2007-07-11 21:46:42Z mike $".
- */