Load cups into easysw/current.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@92 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 23 insertions, 16 deletions

diff --git a/scheduler/env.c b/scheduler/env.c
index f055b3a21..b9c49dc3f 100644
--- a/scheduler/env.c
+++ b/scheduler/env.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: env.c 5245 2006-03-08 13:09:49Z mike $"
+ * "$Id: env.c 5305 2006-03-18 03:05:12Z mike $"
  *
  *   Environment management routines for the Common UNIX Printing System (CUPS).
  *
@@ -23,12 +23,12 @@
  *
  * Contents:
  *
- *   cupsdClearEnv() - Clear common environment variables.
  *   cupsdInitEnv()  - Initialize the current environment with standard
  *                     variables.
  *   cupsdLoadEnv()  - Copy common environment variables into an array.
  *   cupsdSetEnv()   - Set a common environment variable.
  *   cupsdSetEnvf()  - Set a formatted common environment variable.
+ *   clear_env()     - Clear common environment variables.
  */
 
 /*
@@ -47,20 +47,10 @@ static char	*common_env[MAX_ENV];	/* Common env vars */
 
 
 /*
- * 'cupsdClearEnv()' - Clear common environment variables.
+ * Local functions...
  */
 
-void
-cupsdClearEnv(void)
-{
-  int	i;				/* Looping var */
-
-
-  for (i = 0; i < num_common_env; i ++)
-    cupsdClearString(common_env + i);
-
-  num_common_env = 0;
-}
+static void	clear_env(void);
 
 
 /*
@@ -74,7 +64,7 @@ cupsdInitEnv(void)
   * Clear existing environment variables...
   */
 
-  cupsdClearEnv();
+  clear_env();
 
 #if defined(__APPLE__)
  /*
@@ -239,5 +229,22 @@ cupsdSetEnvf(const char *name,		/* I - Name of variable */
 
 
 /*
- * End of "$Id: env.c 5245 2006-03-08 13:09:49Z mike $".
+ * 'clear_env()' - Clear common environment variables.
+ */
+
+static void
+clear_env(void)
+{
+  int	i;				/* Looping var */
+
+
+  for (i = 0; i < num_common_env; i ++)
+    cupsdClearString(common_env + i);
+
+  num_common_env = 0;
+}
+
+
+/*
+ * End of "$Id: env.c 5305 2006-03-18 03:05:12Z mike $".
  */