Remove all of the Subversion keywords from various source files.

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

diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index 8d7117bb2b78d254fb292166cf0227df4dcb68f6..a36ae88d1d709626de0a99ffb5a0357c7f59f83b 100644 (file)
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -1,16 +1,14 @@
 /*
- * "$Id: cupsd.h 7928 2008-09-10 22:14:22Z mike $"
+ * Main header file for the CUPS scheduler.
  *
- *   Main header file for the CUPS scheduler.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2011 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"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ * 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"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 
@@ -20,6 +18,7 @@
 
 #include <cups/cups-private.h>
 #include <cups/file-private.h>
+#include <cups/ppd-private.h>
 
 #include <limits.h>
 #include <time.h>
@@ -82,12 +81,10 @@ extern const char *cups_hstrerror(int);
  * Defaults...
  */
 
-#define DEFAULT_HISTORY                1       /* Preserve job history? */
-#define DEFAULT_FILES          0       /* Preserve job files? */
+#define DEFAULT_HISTORY                INT_MAX /* Preserve job history? */
+#define DEFAULT_FILES          86400   /* Preserve job files? */
 #define DEFAULT_TIMEOUT                300     /* Timeout during requests/updates */
 #define DEFAULT_KEEPALIVE      30      /* Timeout between requests */
-#define DEFAULT_INTERVAL       30      /* Interval between browse updates */
-#define DEFAULT_CHARSET                "utf-8" /* Default charset */
 
 
 /*
@@ -118,6 +115,7 @@ extern const char *cups_hstrerror(int);
 #include "printers.h"
 #include "classes.h"
 #include "job.h"
+#include "colorman.h"
 #include "conf.h"
 #include "banners.h"
 #include "dirsvc.h"
@@ -140,24 +138,13 @@ extern const char *cups_hstrerror(int);
 
 typedef void (*cupsd_selfunc_t)(void *data);
 
-#ifdef HAVE_AVAHI
-/*
- * Timeout callback function type...
- */
-
-typedef struct _cupsd_timeout_s cupsd_timeout_t;
-typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data);
-#endif /* HAVE_AVAHI */
-
 
 /*
  * Globals...
  */
 
-VAR int                        TestConfigFile  VALUE(0),
+VAR int                        TestConfigFile  VALUE(0);
                                        /* Test the cupsd.conf file? */
-                       UseProfiles     VALUE(1);
-                                       /* Use security profiles for child procs? */
 VAR int                        MaxFDs          VALUE(0);
                                        /* Maximum number of files */
 
@@ -170,23 +157,10 @@ VAR int                   NeedReload      VALUE(RELOAD_ALL),
 VAR void               *DefaultProfile VALUE(0);
                                        /* Default security profile */
 
-#ifdef HAVE_GSSAPI
-VAR int                        KerberosInitialized     VALUE(0);
-                                       /* Has Kerberos been initialized? */
-VAR krb5_context       KerberosContext VALUE(NULL);
-                                       /* Kerberos context for credentials */
-#endif /* HAVE_GSSAPI */
-
-#ifdef HAVE_LAUNCH_H
-VAR int                        Launchd         VALUE(0);
-                                       /* Running from launchd */
-#endif /* HAVE_LAUNCH_H */
-
-#ifdef HAVE_AVAHI
-VAR cups_array_t       *Timeouts       VALUE(NULL);
-                                       /* Timed callbacks for main loop */
-#endif /* HAVE_AVAHI */
-
+#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+VAR int                        OnDemand        VALUE(0);
+                                       /* Launched on demand */
+#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
 
 
 /*
@@ -210,6 +184,7 @@ extern cups_file_t  *cupsdCreateConfFile(const char *filename, mode_t mode);
 extern cups_file_t     *cupsdOpenConfFile(const char *filename);
 extern int             cupsdOpenPipe(int *fds);
 extern int             cupsdRemoveFile(const char *filename);
+extern int             cupsdUnlinkOrRemoveFile(const char *filename);
 
 /* main.c */
 extern int             cupsdAddString(cups_array_t **a, const char *s);
@@ -225,11 +200,10 @@ extern void               cupsdSetStringf(char **s, const char *f, ...)
                        __attribute__ ((__format__ (__printf__, 2, 3)));
 
 /* process.c */
-extern void            *cupsdCreateProfile(int job_id);
+extern void            *cupsdCreateProfile(int job_id, int allow_networking);
 extern void            cupsdDestroyProfile(void *profile);
 extern int             cupsdEndProcess(int pid, int force);
-extern const char      *cupsdFinishProcess(int pid, char *name, int namelen,
-                                           int *job_id);
+extern const char      *cupsdFinishProcess(int pid, char *name, size_t namelen, int *job_id);
 extern int             cupsdStartProcess(const char *command, char *argv[],
                                          char *envp[], int infd, int outfd,
                                          int errfd, int backfd, int sidefd,
@@ -250,21 +224,3 @@ extern void                cupsdStopSelect(void);
 /* server.c */
 extern void            cupsdStartServer(void);
 extern void            cupsdStopServer(void);
-
-#ifdef HAVE_AVAHI
-extern cupsd_timeout_t *cupsdAddTimeout(const struct timeval *tv,
-                                        cupsd_timeoutfunc_t cb,
-                                        void *data);
-extern cupsd_timeout_t *cupsdNextTimeout(long *delay);
-extern void            cupsdRemoveTimeout(cupsd_timeout_t *timeout);
-extern void            cupsdRunTimeout(cupsd_timeout_t *timeout);
-extern void            cupsdUpdateTimeout(cupsd_timeout_t *timeout,
-                                          const struct timeval *tv);
-#endif /* HAVE_AVAHI */
-
-extern int             cupsdRemoveFile(const char *filename);
-
-
-/*
- * End of "$Id: cupsd.h 7928 2008-09-10 22:14:22Z mike $".
- */