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 8a6ffd97f40fa475d910d740d51b3b40ca30bd06..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-2012 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>
@@ -144,10 +143,8 @@ typedef void (*cupsd_selfunc_t)(void *data);
  * 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 */
 
@@ -160,10 +157,10 @@ VAR int                   NeedReload      VALUE(RELOAD_ALL),
 VAR void               *DefaultProfile VALUE(0);
                                        /* Default security profile */
 
-#ifdef HAVE_LAUNCH_H
-VAR int                        Launchd         VALUE(0);
-                                       /* Running from launchd */
-#endif /* HAVE_LAUNCH_H */
+#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+VAR int                        OnDemand        VALUE(0);
+                                       /* Launched on demand */
+#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
 
 
 /*
@@ -187,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);
@@ -202,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,
@@ -227,8 +224,3 @@ extern void         cupsdStopSelect(void);
 /* server.c */
 extern void            cupsdStartServer(void);
 extern void            cupsdStopServer(void);
-
-
-/*
- * End of "$Id: cupsd.h 7928 2008-09-10 22:14:22Z mike $".
- */