Load cups into easysw/current.

[thirdparty/cups.git] / scheduler / cups-driverd.c

diff --git a/scheduler/cups-driverd.c b/scheduler/cups-driverd.c
index fd662551d36b6ca2f515d92577b4812d053a5932..1e0b1e45b59c95e25bde1e2070fb697ee375b593 100644 (file)
--- a/scheduler/cups-driverd.c
+++ b/scheduler/cups-driverd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups-driverd.c 5333 2006-03-24 00:52:21Z mike $"
+ * "$Id: cups-driverd.c 5422 2006-04-18 15:16:00Z mike $"
  *
  *   PPD/driver support for the Common UNIX Printing System (CUPS).
  *
@@ -142,7 +142,7 @@ add_ppd(const char *name,           /* I - PPD name */
         const char *natural_language,  /* I - Language(s) */
         const char *make,              /* I - Manufacturer */
        const char *make_and_model,     /* I - NickName */
-       const char *device_id,          /* I - 1284DeviceId */
+       const char *device_id,          /* I - 1284DeviceID */
         time_t     mtime,              /* I - Modification time */
        size_t     size)                /* I - File size */
 {
@@ -656,7 +656,7 @@ load_ppds(const char *d,            /* I - Actual directory */
                make_model[256],        /* Make and Model */
                model_name[256],        /* ModelName */
                nick_name[256],         /* NickName */
-               device_id[256];         /* 1284DeviceId */
+               device_id[256];         /* 1284DeviceID */
   ppd_info_t   *ppd,                   /* New PPD file */
                key;                    /* Search key */
   int          new_ppd;                /* Is this a new PPD? */
@@ -799,7 +799,7 @@ load_ppds(const char *d,            /* I - Actual directory */
        sscanf(line, "%*[^:]:%63s", lang_version);
       else if (!strncmp(line, "*NickName:", 10))
        sscanf(line, "%*[^\"]\"%255[^\"]", nick_name);
-      else if (!strncmp(line, "*1284DeviceId:", 14))
+      else if (!strncasecmp(line, "*1284DeviceID:", 14))
        sscanf(line, "%*[^\"]\"%255[^\"]", device_id);
       else if (!strncmp(line, "*OpenUI", 7))
       {
@@ -1113,5 +1113,5 @@ load_drivers(void)
 
 
 /*
- * End of "$Id: cups-driverd.c 5333 2006-03-24 00:52:21Z mike $".
+ * End of "$Id: cups-driverd.c 5422 2006-04-18 15:16:00Z mike $".
  */