Load cups into easysw/current.

[thirdparty/cups.git] / scheduler / policy.c

diff --git a/scheduler/policy.c b/scheduler/policy.c
index db851adc65e29378a1a266e6d9a5ab01f9653bd4..593e38183deb49e48a2ffb54a23ce7536f9ae060 100644 (file)
--- a/scheduler/policy.c
+++ b/scheduler/policy.c
@@ -1,25 +1,16 @@
 /*
- * "$Id$"
+ * "$Id: policy.c 6649 2007-07-11 21:46:42Z mike $"
  *
  *   Policy routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   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/".
  *
  * Contents:
  *
@@ -195,7 +186,7 @@ cupsdCheckPolicy(cupsd_policy_t *p, /* I - Policy */
   {
     cupsdLogMessage(CUPSD_LOG_CRIT, "cupsdCheckPolicy: p=%p, con=%p!", p, con);
 
-    return (0);
+    return ((http_status_t)0);
   }
 
  /*
@@ -205,7 +196,7 @@ cupsdCheckPolicy(cupsd_policy_t *p, /* I - Policy */
   if ((po = cupsdFindPolicyOp(p, con->request->request.op.operation_id)) == NULL)
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdCheckPolicy: No matching operation, returning 0!");
-    return (0);
+    return ((http_status_t)0);
   }
 
   con->best = po;
@@ -330,5 +321,5 @@ cupsdFindPolicyOp(cupsd_policy_t *p,        /* I - Policy */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: policy.c 6649 2007-07-11 21:46:42Z mike $".
  */