Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3559 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index de024a439b095c50db622c4a26239955d08dee7a..de9423708a474d1e155a2b57eb1bb5541aa5b59e 100644 (file)
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dirsvc.c,v 1.73.2.29 2003/03/31 19:20:15 mike Exp $"
+ * "$Id: dirsvc.c,v 1.73.2.30 2003/04/02 13:17:59 mike Exp $"
  *
  *   Directory services routines for the Common UNIX Printing System (CUPS).
  *
@@ -618,7 +618,9 @@ SendCUPSBrowse(printer_t *p)                /* I - Printer to send */
          snprintf(packet, sizeof(packet), "%x %x ipp://%s/%s/%s \"%s\" \"%s\" \"%s\"\n",
                   p->type | CUPS_PRINTER_REMOTE, p->state, iface->hostname,
                   (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers",
-                  p->name, p->location, p->info, p->make_model);
+                  p->name, p->location ? p->location : "",
+                  p->info ? p->info : "",
+                  p->make_model ? p->make_model : "Unknown");
 
          bytes = strlen(packet);
 
@@ -654,7 +656,9 @@ SendCUPSBrowse(printer_t *p)                /* I - Printer to send */
        snprintf(packet, sizeof(packet), "%x %x ipp://%s/%s/%s \"%s\" \"%s\" \"%s\"\n",
                 p->type | CUPS_PRINTER_REMOTE, p->state, iface->hostname,
                 (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers",
-                p->name, p->location, p->info, p->make_model);
+                p->name, p->location ? p->location : "",
+                p->info ? p->info : "",
+                p->make_model ? p->make_model : "Unknown");
 
        bytes = strlen(packet);
 
@@ -690,7 +694,9 @@ SendCUPSBrowse(printer_t *p)                /* I - Printer to send */
 
       snprintf(packet, sizeof(packet), "%x %x %s \"%s\" \"%s\" \"%s\"\n",
                p->type | CUPS_PRINTER_REMOTE, p->state, p->uri,
-              p->location, p->info, p->make_model);
+              p->location ? p->location : "",
+              p->info ? p->info : "",
+              p->make_model ? p->make_model : "Unknown");
 
       bytes = strlen(packet);
       LogMessage(L_DEBUG2, "SendBrowseList: (%d bytes) %s", bytes, packet);
@@ -1923,5 +1929,5 @@ UpdateSLPBrowse(void)
 
 
 /*
- * End of "$Id: dirsvc.c,v 1.73.2.29 2003/03/31 19:20:15 mike Exp $".
+ * End of "$Id: dirsvc.c,v 1.73.2.30 2003/04/02 13:17:59 mike Exp $".
  */