From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Wed, 5 Feb 2003 21:18:56 +0000 (+0000)
Subject: Make sure device_uri is initialized.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb78148f7fa0ec40e01f2309912d29399992a522;p=thirdparty%2Fcups.git

Make sure device_uri is initialized.

Don't need backend string (not used).


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@3324 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 6f40eda5ef..11ec39f987 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c,v 1.136 2003/01/29 19:54:52 mike Exp $"
+ * "$Id: printers.c,v 1.137 2003/02/05 21:18:55 mike Exp $"
  *
  *   Printer routines for the Common UNIX Printing System (CUPS).
  *
@@ -97,6 +97,7 @@ AddPrinter(const char *name)	/* I - Name of printer */
   SetString(&p->hostname, ServerName);
   SetStringf(&p->uri, "ipp://%s:%d/printers/%s", ServerName,
              ntohs(Listeners[0].address.sin_port), name);
+  SetStringf(&p->device_uri, "file:/dev/null");
 
   p->state     = IPP_PRINTER_STOPPED;
   p->accepting = 0;
@@ -360,7 +361,6 @@ DeletePrinter(printer_t *p)	/* I - Printer to delete */
   ClearString(&p->job_sheets[0]);
   ClearString(&p->job_sheets[1]);
   ClearString(&p->device_uri);
-  ClearString(&p->backend);
 
   free(p);
 
@@ -2133,5 +2133,5 @@ write_irix_state(printer_t *p)	/* I - Printer to update */
 
 
 /*
- * End of "$Id: printers.c,v 1.136 2003/01/29 19:54:52 mike Exp $".
+ * End of "$Id: printers.c,v 1.137 2003/02/05 21:18:55 mike Exp $".
  */
diff --git a/scheduler/printers.h b/scheduler/printers.h
index e2b295ea5f..aac693067d 100644
--- a/scheduler/printers.h
+++ b/scheduler/printers.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.h,v 1.29 2003/01/29 19:54:53 mike Exp $"
+ * "$Id: printers.h,v 1.30 2003/02/05 21:18:56 mike Exp $"
  *
  *   Printer definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -55,8 +55,7 @@ typedef struct printer_str
   char		*job_sheets[2];		/* Banners/job sheets */
   cups_ptype_t	type;			/* Printer type (color, small, etc.) */
   time_t	browse_time;		/* Last time update was sent/received */
-  char		*device_uri,		/* Device URI */
-		*backend;		/* Backend to use */
+  char		*device_uri;		/* Device URI */
   int		raw;			/* Raw queue? */
   mime_type_t	*filetype;		/* Pseudo-filetype for printer */
   void		*job;			/* Current job in queue */
@@ -115,5 +114,5 @@ extern void		WritePrintcap(void);
 
 
 /*
- * End of "$Id: printers.h,v 1.29 2003/01/29 19:54:53 mike Exp $".
+ * End of "$Id: printers.h,v 1.30 2003/02/05 21:18:56 mike Exp $".
  */